From fbdf977a8094bb1e0baca85ffb3ed7f326986639 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 15 Jan 2016 12:55:30 +0000 Subject: insane: Start to clean up do_configure_qa code This cleans up the do_configure_qa code so that the exit status from package_qa_handle_error is handled correctly. It also converts package_qa_check_license to use our standard QA check configuration interface through package_qa_handle_error rather than a mix of return values, bb.fatal and bb.build.FuncFailed. Due to the merging of multiple lines into one message, we need to tweak a QA test to account for this. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/lic-checksum.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/selftest/lic-checksum.py b/meta/lib/oeqa/selftest/lic-checksum.py index bd3b9a1ba3..cac6d84452 100644 --- a/meta/lib/oeqa/selftest/lic-checksum.py +++ b/meta/lib/oeqa/selftest/lic-checksum.py @@ -13,7 +13,7 @@ class LicenseTests(oeSelfTest): @testcase(1197) def test_nonmatching_checksum(self): bitbake_cmd = '-c configure emptytest' - error_msg = 'ERROR: emptytest: The new md5 checksum is 8d777f385d3dfec8815d20f7496026dc' + error_msg = 'emptytest: The new md5 checksum is 8d777f385d3dfec8815d20f7496026dc' lic_file, lic_path = tempfile.mkstemp() os.close(lic_file) -- cgit v1.2.3