summaryrefslogtreecommitdiff
path: root/meta/lib
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:41:30 +0000
commitabc691026592b406e69f8bf9e4fffe2e6a17fffc (patch)
treeff2de5c46bf0e59ade8dc6794631ec73c384ff89 /meta/lib
parent365ab9118b6c68aedb2e79129202b385329a8abb (diff)
downloadopenembedded-core-abc691026592b406e69f8bf9e4fffe2e6a17fffc.tar.gz
openembedded-core-abc691026592b406e69f8bf9e4fffe2e6a17fffc.tar.bz2
openembedded-core-abc691026592b406e69f8bf9e4fffe2e6a17fffc.zip
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. Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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):
def test_warnings_errors(self):
result = bitbake('-b asdf', ignore_status=True)
- find_warnings = re.search("Summary: There was [1-9][0-9]* WARNING message shown.", result.output)
- find_errors = re.search("Summary: There was [1-9][0-9]* ERROR message shown.", result.output)
- self.assertTrue(find_warnings)
- self.assertTrue(find_errors)
+ find_warnings = re.search("Summary: There w.{2,3}? [1-9][0-9]* WARNING messages* shown", result.output)
+ find_errors = re.search("Summary: There w.{2,3}? [1-9][0-9]* ERROR messages* shown", result.output)
+ self.assertTrue(find_warnings, msg="Did not find the mumber of warnings at the end of the build:\n" + result.output)
+ self.assertTrue(find_errors, msg="Did not find the mumber of errors at the end of the build:\n" + result.output)
def test_invalid_patch(self):
self.write_recipeinc('man', 'SRC_URI += "file://man-1.5h1-make.patch"')