Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (172828 => 172829)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-08-21 10:51:03 UTC (rev 172828)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-08-21 12:29:37 UTC (rev 172829)
@@ -552,8 +552,8 @@
def countFailures(self, cmd):
logText = cmd.logs['stdio'].getText()
- # We're looking for the line that looks like this: 0 regressions found.\n0 tests fixed.
- regex = re.compile(r'(?P<count>\d+) regressions found.')
+ # We're looking for the line that looks like this: 0 regressions found.
+ regex = re.compile(r'(?P<count>\d+) regressions? found.')
for line in logText.splitlines():
match = regex.match(line)
if not match:
@@ -571,8 +571,8 @@
def countFailures(self, cmd):
logText = cmd.logs['stdio'].getText()
- # We're looking for the line that looks like this: 0 regressions found.\n0 tests fixed.
- regex = re.compile(r'(?P<count>\d+) regressions found.')
+ # We're looking for the line that looks like this: 0 failures found.
+ regex = re.compile(r'(?P<count>\d+) failures? found.')
for line in logText.splitlines():
match = regex.match(line)
if not match:
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (172828 => 172829)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-08-21 10:51:03 UTC (rev 172828)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-08-21 12:29:37 UTC (rev 172829)
@@ -142,6 +142,48 @@
5 failures found.""")
+class RunLLINTCLoopTestsTest(unittest.TestCase):
+ def assertResults(self, expected_result, expected_text, rc, stdio):
+ cmd = StubRemoteCommand(rc, stdio)
+ step = RunLLINTCLoopTests()
+ step.commandComplete(cmd)
+ actual_results = step.evaluateCommand(cmd)
+ actual_text = step.getText2(cmd, actual_results)
+
+ self.assertEqual(expected_result, actual_results)
+ self.assertEqual(actual_text, expected_text)
+
+ def test_failures(self):
+ self.assertResults(FAILURE, ['5 regressions found.'], 1, '5 regressions found.')
+
+ def test_failure(self):
+ self.assertResults(FAILURE, ['1 regressions found.'], 1, '1 regression found.')
+
+ def test_no_failure(self):
+ self.assertResults(SUCCESS, ['webkit-jsc-cloop-test'], 0, '0 regressions found.')
+
+
+class Run32bitJSCTestsTest(unittest.TestCase):
+ def assertResults(self, expected_result, expected_text, rc, stdio):
+ cmd = StubRemoteCommand(rc, stdio)
+ step = Run32bitJSCTests()
+ step.commandComplete(cmd)
+ actual_results = step.evaluateCommand(cmd)
+ actual_text = step.getText2(cmd, actual_results)
+
+ self.assertEqual(expected_result, actual_results)
+ self.assertEqual(actual_text, expected_text)
+
+ def test_failures(self):
+ self.assertResults(FAILURE, ['5 regressions found.'], 1, '5 failures found.')
+
+ def test_failure(self):
+ self.assertResults(FAILURE, ['1 regressions found.'], 1, '1 failure found.')
+
+ def test_no_failure(self):
+ self.assertResults(SUCCESS, ['webkit-32bit-jsc-test'], 0, '0 failures found.')
+
+
class RunUnitTestsTest(unittest.TestCase):
def assertFailures(self, expected_failure_count, stdio):
if expected_failure_count:
Modified: trunk/Tools/ChangeLog (172828 => 172829)
--- trunk/Tools/ChangeLog 2014-08-21 10:51:03 UTC (rev 172828)
+++ trunk/Tools/ChangeLog 2014-08-21 12:29:37 UTC (rev 172829)
@@ -1,3 +1,25 @@
+2014-08-21 Renato Nagy <[email protected]>
+
+ Fix countFailures of RunLLINTCLoopTests and Run32bitJSCTests.
+ https://bugs.webkit.org/show_bug.cgi?id=136125
+
+ Reviewed by Csaba Osztrogonác.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunLLINTCLoopTests.countFailures):
+ (Run32bitJSCTests.countFailures):
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ (RunLLINTCLoopTestsTest):
+ (RunLLINTCLoopTestsTest.assertResults):
+ (RunLLINTCLoopTestsTest.test_failures):
+ (RunLLINTCLoopTestsTest.test_failure):
+ (RunLLINTCLoopTestsTest.test_no_failure):
+ (Run32bitJSCTestsTest):
+ (Run32bitJSCTestsTest.assertResults):
+ (Run32bitJSCTestsTest.test_failures):
+ (Run32bitJSCTestsTest.test_failure):
+ (Run32bitJSCTestsTest.test_no_failure):
+
2014-08-20 Gyuyoung Kim <[email protected]>
Unreviewed, EFL build fix since r172814.
