Changeset 172829 in webkit

Timestamp:

Aug 21, 2014 5:29:37 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Fix countFailures of RunLLINTCLoopTests and Run32bitJSCTests.
​https://bugs.webkit.org/show_bug.cgi?id=136125

Patch by Renato Nagy <​nagy.renato@stud.u-szeged.hu> on 2014-08-21
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):

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/master.cfg (modified) (2 diffs)
• BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

@@ -553 +553 @@
     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)
@@ -572 +572 @@
     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)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py

@@ -143 +143 @@
 
 
+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):

trunk/Tools/ChangeLog

@@ +1 @@
+2014-08-21  Renato Nagy  <nagy.renato@stud.u-szeged.hu>
+
+        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  <gyuyoung.kim@samsung.com>