summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-25 17:56:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:36:01 +0100
commitd1052050bd6594d1d0e8dc1c8edce4866cc669e1 (patch)
tree866b446381c35892d010b1c9ce1a6e02a57f4076
parentb749251338972e019a108a988457c60f94032b4d (diff)
downloadpoky-d1052050bd6594d1d0e8dc1c8edce4866cc669e1.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/sstatetests.py9
1 files 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\"
220BUILD_OS = \"linux\" 220BUILD_OS = \"linux\"
221""") 221""")
222 self.track_for_cleanup(topdir + "/tmp-sstatesamehash") 222 self.track_for_cleanup(topdir + "/tmp-sstatesamehash")
223 bitbake("core-image-sato -S printdiff", ignore_status=True) 223 bitbake("core-image-sato -S none")
224 self.write_config(""" 224 self.write_config("""
225TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 225TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
226BUILD_ARCH = \"i686\" 226BUILD_ARCH = \"i686\"
227BUILD_OS = \"linux\" 227BUILD_OS = \"linux\"
228""") 228""")
229 self.track_for_cleanup(topdir + "/tmp-sstatesamehash2") 229 self.track_for_cleanup(topdir + "/tmp-sstatesamehash2")
230 bitbake("core-image-sato -S printdiff", ignore_status=True) 230 bitbake("core-image-sato -S none")
231 231
232 def get_files(d): 232 def get_files(d):
233 f = [] 233 f = []
@@ -249,19 +249,18 @@ BUILD_OS = \"linux\"
249 """ 249 """
250 250
251 topdir = get_bb_var('TOPDIR') 251 topdir = get_bb_var('TOPDIR')
252 targetvendor = get_bb_var('TARGET_VENDOR')
253 self.write_config(""" 252 self.write_config("""
254TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 253TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
255NATIVELSBSTRING = \"DistroA\" 254NATIVELSBSTRING = \"DistroA\"
256""") 255""")
257 self.track_for_cleanup(topdir + "/tmp-sstatesamehash") 256 self.track_for_cleanup(topdir + "/tmp-sstatesamehash")
258 bitbake("core-image-sato -S printdiff", ignore_status=True) 257 bitbake("core-image-sato -S none")
259 self.write_config(""" 258 self.write_config("""
260TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 259TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
261NATIVELSBSTRING = \"DistroB\" 260NATIVELSBSTRING = \"DistroB\"
262""") 261""")
263 self.track_for_cleanup(topdir + "/tmp-sstatesamehash2") 262 self.track_for_cleanup(topdir + "/tmp-sstatesamehash2")
264 bitbake("core-image-sato -S printdiff", ignore_status=True) 263 bitbake("core-image-sato -S none")
265 264
266 def get_files(d): 265 def get_files(d):
267 f = [] 266 f = []