Changeset 172829 in webkit
- Timestamp:
- Aug 21, 2014 5:29:37 AM (10 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
r172748 r172829 553 553 def countFailures(self, cmd): 554 554 logText = cmd.logs['stdio'].getText() 555 # We're looking for the line that looks like this: 0 regressions found. \n0 tests fixed.556 regex = re.compile(r'(?P<count>\d+) regressions found.')555 # We're looking for the line that looks like this: 0 regressions found. 556 regex = re.compile(r'(?P<count>\d+) regressions? found.') 557 557 for line in logText.splitlines(): 558 558 match = regex.match(line) … … 572 572 def countFailures(self, cmd): 573 573 logText = cmd.logs['stdio'].getText() 574 # We're looking for the line that looks like this: 0 regressions found.\n0 tests fixed.575 regex = re.compile(r'(?P<count>\d+) regressionsfound.')574 # We're looking for the line that looks like this: 0 failures found. 575 regex = re.compile(r'(?P<count>\d+) failures? found.') 576 576 for line in logText.splitlines(): 577 577 match = regex.match(line) -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py
r172748 r172829 143 143 144 144 145 class RunLLINTCLoopTestsTest(unittest.TestCase): 146 def assertResults(self, expected_result, expected_text, rc, stdio): 147 cmd = StubRemoteCommand(rc, stdio) 148 step = RunLLINTCLoopTests() 149 step.commandComplete(cmd) 150 actual_results = step.evaluateCommand(cmd) 151 actual_text = step.getText2(cmd, actual_results) 152 153 self.assertEqual(expected_result, actual_results) 154 self.assertEqual(actual_text, expected_text) 155 156 def test_failures(self): 157 self.assertResults(FAILURE, ['5 regressions found.'], 1, '5 regressions found.') 158 159 def test_failure(self): 160 self.assertResults(FAILURE, ['1 regressions found.'], 1, '1 regression found.') 161 162 def test_no_failure(self): 163 self.assertResults(SUCCESS, ['webkit-jsc-cloop-test'], 0, '0 regressions found.') 164 165 166 class Run32bitJSCTestsTest(unittest.TestCase): 167 def assertResults(self, expected_result, expected_text, rc, stdio): 168 cmd = StubRemoteCommand(rc, stdio) 169 step = Run32bitJSCTests() 170 step.commandComplete(cmd) 171 actual_results = step.evaluateCommand(cmd) 172 actual_text = step.getText2(cmd, actual_results) 173 174 self.assertEqual(expected_result, actual_results) 175 self.assertEqual(actual_text, expected_text) 176 177 def test_failures(self): 178 self.assertResults(FAILURE, ['5 regressions found.'], 1, '5 failures found.') 179 180 def test_failure(self): 181 self.assertResults(FAILURE, ['1 regressions found.'], 1, '1 failure found.') 182 183 def test_no_failure(self): 184 self.assertResults(SUCCESS, ['webkit-32bit-jsc-test'], 0, '0 failures found.') 185 186 145 187 class RunUnitTestsTest(unittest.TestCase): 146 188 def assertFailures(self, expected_failure_count, stdio): -
trunk/Tools/ChangeLog
r172825 r172829 1 2014-08-21 Renato Nagy <nagy.renato@stud.u-szeged.hu> 2 3 Fix countFailures of RunLLINTCLoopTests and Run32bitJSCTests. 4 https://bugs.webkit.org/show_bug.cgi?id=136125 5 6 Reviewed by Csaba Osztrogonác. 7 8 * BuildSlaveSupport/build.webkit.org-config/master.cfg: 9 (RunLLINTCLoopTests.countFailures): 10 (Run32bitJSCTests.countFailures): 11 * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py: 12 (RunLLINTCLoopTestsTest): 13 (RunLLINTCLoopTestsTest.assertResults): 14 (RunLLINTCLoopTestsTest.test_failures): 15 (RunLLINTCLoopTestsTest.test_failure): 16 (RunLLINTCLoopTestsTest.test_no_failure): 17 (Run32bitJSCTestsTest): 18 (Run32bitJSCTestsTest.assertResults): 19 (Run32bitJSCTestsTest.test_failures): 20 (Run32bitJSCTestsTest.test_failure): 21 (Run32bitJSCTestsTest.test_no_failure): 22 1 23 2014-08-20 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 24
Note: See TracChangeset
for help on using the changeset viewer.