From 347cc15ebdf7c90714ac1c6cb54047b315e6e00c Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Wed, 4 Dec 2013 15:13:52 +0200 Subject: lib/oeqa/selftest: buildoptions: small fixes for some tests While harmless, we should overwrite the config not append to it, and use m4 as target, otherwise the WARN check will build an entire image and we are not interested in that. Also add an output check for the WARN_QA test. (From OE-Core rev: 83b0a9231691aba9a7753350d131b0ab9196815e) Signed-off-by: Stefan Stanacar Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/buildoptions.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'meta/lib/oeqa/selftest/buildoptions.py') diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py index f99dda71ff..5fb69d8170 100644 --- a/meta/lib/oeqa/selftest/buildoptions.py +++ b/meta/lib/oeqa/selftest/buildoptions.py @@ -46,16 +46,16 @@ class DiskMonTest(oeSelfTest): def test_stoptask_behavior(self): result = runCmd("df -k %s" % os.getcwd()) size = result.output.split("\n")[1].split()[3] - self.append_config('BB_DISKMON_DIRS = "STOPTASKS,${TMPDIR},%sK,4510K"' % size) - res = bitbake("core-image-minimal", ignore_status = True) + self.write_config('BB_DISKMON_DIRS = "STOPTASKS,${TMPDIR},%sK,4510K"' % size) + res = bitbake("m4", ignore_status = True) self.assertTrue('ERROR: No new tasks can be executed since the disk space monitor action is "STOPTASKS"!' in res.output) self.assertEqual(res.status, 1) - self.append_config('BB_DISKMON_DIRS = "ABORT,${TMPDIR},%sK,4510K"' % size) - res = bitbake("core-image-minimal", ignore_status = True) + self.write_config('BB_DISKMON_DIRS = "ABORT,${TMPDIR},%sK,4510K"' % size) + res = bitbake("m4", ignore_status = True) self.assertTrue('ERROR: Immediately abort since the disk space monitor action is "ABORT"!' in res.output) self.assertEqual(res.status, 1) - self.append_config('BB_DISKMON_DIRS = "WARN,${TMPDIR},%sK,4510K"' % size) - res = bitbake("core-image-minimal") + self.write_config('BB_DISKMON_DIRS = "WARN,${TMPDIR},%sK,4510K"' % size) + res = bitbake("m4") self.assertTrue('WARNING: The free space' in res.output) class SanityOptionsTest(oeSelfTest): @@ -74,9 +74,10 @@ class SanityOptionsTest(oeSelfTest): self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"') self.append_config('ERROR_QA_remove = "packages-list"') self.append_config('WARN_QA_append = " packages-list"') - bitbake("xcursor-transparent-theme") + res = bitbake("xcursor-transparent-theme") bitbake("xcursor-transparent-theme -ccleansstate") self.delete_recipeinc('xcursor-transparent-theme') + self.assertTrue("WARNING: QA Issue: xcursor-transparent-theme-dbg is listed in PACKAGES multiple times, this leads to packaging errors." in res.output) def test_sanity_userspace_dependency(self): self.append_config('WARN_QA_append = " unsafe-references-in-binaries unsafe-references-in-scripts"') -- cgit v1.2.3-54-g00ecf