diff options
| author |   Stefan Stanacar <stefanx.stanacar@intel.com> | 2013-12-04 15:13:52 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-05 12:32:10 +0000 |
| commit | 83b0a9231691aba9a7753350d131b0ab9196815e (patch) | |
| tree | a8f77617406e758aded55fc10ef2df2e17a764a3 | |
| parent | 9c93526756e7cbbff027c88eb972f877bcb1f057 (diff) | |
| download | openembedded-core-contrib-83b0a9231691aba9a7753350d131b0ab9196815e.tar.gz | |
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.
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/buildoptions.py | 15 |
1 files changed, 8 insertions, 7 deletions
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"') |