summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorneliu Stoicescu <corneliux.stoicescu@intel.com>2014-07-28 15:59:19 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-29 08:58:27 (GMT)
commitd73810941510bbbe1dcd3536ac7e82c0e9f135bc (patch)
tree3ea0d14ce00dfdc8ef7e81c3a51ae93e86e7d582
parent062bd810fcd8c3d80689ab404766d20c9251dca6 (diff)
downloadpoky-d73810941510bbbe1dcd3536ac7e82c0e9f135bc.tar.gz
selftest/buildoptions.py: fix QA_WARN test and add more output when failing
The -ccleansstate should be done before building the package for the second time. Also printing the command output when failing. (From OE-Core rev: 15e5661d6341004ebc4d3492acb48f73dd86b96e) Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/buildoptions.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py
index 27fc452..ec541e5 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/meta/lib/oeqa/selftest/buildoptions.py
@@ -74,15 +74,15 @@ class SanityOptionsTest(oeSelfTest):
74 self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"') 74 self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"')
75 res = bitbake("xcursor-transparent-theme", ignore_status=True) 75 res = bitbake("xcursor-transparent-theme", ignore_status=True)
76 self.delete_recipeinc('xcursor-transparent-theme') 76 self.delete_recipeinc('xcursor-transparent-theme')
77 self.assertTrue("ERROR: QA Issue: xcursor-transparent-theme-dbg is listed in PACKAGES multiple times, this leads to packaging errors." in res.output) 77 self.assertTrue("ERROR: QA Issue: xcursor-transparent-theme-dbg is listed in PACKAGES multiple times, this leads to packaging errors." in res.output, msg=res.output)
78 self.assertEqual(res.status, 1) 78 self.assertEqual(res.status, 1)
79 self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"') 79 self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"')
80 self.append_config('ERROR_QA_remove = "packages-list"') 80 self.append_config('ERROR_QA_remove = "packages-list"')
81 self.append_config('WARN_QA_append = " packages-list"') 81 self.append_config('WARN_QA_append = " packages-list"')
82 res = bitbake("xcursor-transparent-theme")
83 bitbake("xcursor-transparent-theme -ccleansstate") 82 bitbake("xcursor-transparent-theme -ccleansstate")
83 res = bitbake("xcursor-transparent-theme")
84 self.delete_recipeinc('xcursor-transparent-theme') 84 self.delete_recipeinc('xcursor-transparent-theme')
85 self.assertTrue("WARNING: QA Issue: xcursor-transparent-theme-dbg is listed in PACKAGES multiple times, this leads to packaging errors." in res.output) 85 self.assertTrue("WARNING: QA Issue: xcursor-transparent-theme-dbg is listed in PACKAGES multiple times, this leads to packaging errors." in res.output, msg=res.output)
86 86
87 def test_sanity_userspace_dependency(self): 87 def test_sanity_userspace_dependency(self):
88 self.append_config('WARN_QA_append = " unsafe-references-in-binaries unsafe-references-in-scripts"') 88 self.append_config('WARN_QA_append = " unsafe-references-in-binaries unsafe-references-in-scripts"')