summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCorneliu Stoicescu <corneliux.stoicescu@intel.com>2014-03-27 12:32:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-27 09:42:07 +0000
commit604dd7374b4651f1844272efb4e30e05e1f449d2 (patch)
tree182618572e830fb2efa2c1b26ada7d0916339e70 /meta
parentebfd07544751611c7ac03e6b1e7a79676ffa0873 (diff)
downloadpoky-604dd7374b4651f1844272efb4e30e05e1f449d2.tar.gz
selftest/bbtests.py: Fixed regex and added bitbake output to test_warnings_errors
The test failed when more than 1 error or 1 warning is present. Also pasting the bitbake output when the test fails. (From OE-Core rev: abc691026592b406e69f8bf9e4fffe2e6a17fffc) Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/bbtests.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py
index ee1f82a217..6815ecfe0b 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -47,10 +47,10 @@ class BitbakeTests(oeSelfTest):
47 47
48 def test_warnings_errors(self): 48 def test_warnings_errors(self):
49 result = bitbake('-b asdf', ignore_status=True) 49 result = bitbake('-b asdf', ignore_status=True)
50 find_warnings = re.search("Summary: There was [1-9][0-9]* WARNING message shown.", result.output) 50 find_warnings = re.search("Summary: There w.{2,3}? [1-9][0-9]* WARNING messages* shown", result.output)
51 find_errors = re.search("Summary: There was [1-9][0-9]* ERROR message shown.", result.output) 51 find_errors = re.search("Summary: There w.{2,3}? [1-9][0-9]* ERROR messages* shown", result.output)
52 self.assertTrue(find_warnings) 52 self.assertTrue(find_warnings, msg="Did not find the mumber of warnings at the end of the build:\n" + result.output)
53 self.assertTrue(find_errors) 53 self.assertTrue(find_errors, msg="Did not find the mumber of errors at the end of the build:\n" + result.output)
54 54
55 def test_invalid_patch(self): 55 def test_invalid_patch(self):
56 self.write_recipeinc('man', 'SRC_URI += "file://man-1.5h1-make.patch"') 56 self.write_recipeinc('man', 'SRC_URI += "file://man-1.5h1-make.patch"')