From d1052050bd6594d1d0e8dc1c8edce4866cc669e1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 25 Aug 2015 17:56:12 +0100 Subject: [PATCH] oeqa: Optimise sstate tests We can use "none" here instead of printdiff for some small performance gains. This also means we can remove the ignore exit code hack which leads to safer code. Also drop an unused variable. (From OE-Core rev: e2b8d6fa45b1ae530be2ffabf48ea61d4c467066) (From OE-Core rev: dd08ea759294415e7357bd1fb8fcd6d976e4f016) Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/sstatetests.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py index 6eacb57fc3..0a761671a0 100644 --- a/meta/lib/oeqa/selftest/sstatetests.py +++ b/meta/lib/oeqa/selftest/sstatetests.py @@ -220,14 +220,14 @@ BUILD_ARCH = \"x86_64\" BUILD_OS = \"linux\" """) self.track_for_cleanup(topdir + "/tmp-sstatesamehash") - bitbake("core-image-sato -S printdiff", ignore_status=True) + bitbake("core-image-sato -S none") self.write_config(""" TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" BUILD_ARCH = \"i686\" BUILD_OS = \"linux\" """) self.track_for_cleanup(topdir + "/tmp-sstatesamehash2") - bitbake("core-image-sato -S printdiff", ignore_status=True) + bitbake("core-image-sato -S none") def get_files(d): f = [] @@ -249,19 +249,18 @@ BUILD_OS = \"linux\" """ topdir = get_bb_var('TOPDIR') - targetvendor = get_bb_var('TARGET_VENDOR') self.write_config(""" TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" NATIVELSBSTRING = \"DistroA\" """) self.track_for_cleanup(topdir + "/tmp-sstatesamehash") - bitbake("core-image-sato -S printdiff", ignore_status=True) + bitbake("core-image-sato -S none") self.write_config(""" TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" NATIVELSBSTRING = \"DistroB\" """) self.track_for_cleanup(topdir + "/tmp-sstatesamehash2") - bitbake("core-image-sato -S printdiff", ignore_status=True) + bitbake("core-image-sato -S none") def get_files(d): f = []