Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (172747 => 172748)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-08-19 07:37:45 UTC (rev 172747)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-08-19 08:09:10 UTC (rev 172748)
@@ -309,8 +309,6 @@
expressions = [
('failing Mozilla test', re.compile(r'^Results for Mozilla tests:\r?\n\s+(\d+) regression', re.MULTILINE)),
- ('failing js test', re.compile(r'^Results for LayoutTests/js tests:\r?\n\s+(\d+) failure', re.MULTILINE)),
- ('crashing js test', re.compile(r'^Results for LayoutTests/js tests:\r?\n.*\n\s+(\d+) crash', re.MULTILINE)),
('failing JSC stress test', re.compile(r'^Results for JSC stress tests:\r?\n\s+(\d+) failure', re.MULTILINE)),
]
resultLines = {}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (172747 => 172748)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-08-19 07:37:45 UTC (rev 172747)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-08-19 08:09:10 UTC (rev 172748)
@@ -118,89 +118,30 @@
0 tests fixed.
OK.""")
+ def test_no_failure_new_output(self):
+ self.assertResults(SUCCESS, ["jscore-test"], 0, """Results for JSC stress tests:
+ 0 failures found.
+ OK.""")
+
def test_mozilla_failure_old_output(self):
self.assertResults(FAILURE, ["jscore-test", '1 failing Mozilla test '], 1, """Results for Mozilla tests:
1 regression found.
0 tests fixed.""")
- def test_mozilla_failure_new_output(self):
- self.assertResults(FAILURE, ["jscore-test", '1 failing Mozilla test '], 1, """Results for Mozilla tests:
- 1 regression found.
- 0 tests fixed.
+ def test_mozilla_failures_old_output(self):
+ self.assertResults(FAILURE, ["jscore-test", '2 failing Mozilla tests '], 1, """Results for Mozilla tests:
+ 2 regressions found.
+ 0 tests fixed.""")
-Results for LayoutTests/js tests:
- 0 failures found.
- 0 crashes found.
- OK.""")
-
- def test_layout_failure_new_output(self):
- self.assertResults(FAILURE, ["jscore-test", '469 failing js tests '], 1, """Results for Mozilla tests:
- 0 regressions found.
- 0 tests fixed.
- OK.
-
-Results for LayoutTests/js tests:
- 469 failures found.
- 0 crashes found.
-
-Results for JSC stress tests:
- 0 failures found.
- OK.""")
-
- def test_layout_crash_new_output(self):
- self.assertResults(FAILURE, ["jscore-test", '1 crashing js test '], 1, """Results for Mozilla tests:
- 0 regressions found.
- 0 tests fixed.
- OK.
-
-Results for LayoutTests/js tests:
- 0 failures found.
- 1 crashes found.
-
-Results for JSC stress tests:
- 0 failures found.
- OK.""")
-
- def test_mozilla_and_layout_failure_new_output(self):
- self.assertResults(FAILURE, ["jscore-test", '1 failing Mozilla test ', '469 failing js tests '], 1, """Results for Mozilla tests:
- 1 regression found.
- 0 tests fixed.
-
-Results for LayoutTests/js tests:
- 469 failures found.
- 0 crashes found.
-
-Results for JSC stress tests:
- 0 failures found.
- OK.""")
-
def test_jsc_stress_failure_new_output(self):
- self.assertResults(FAILURE, ["jscore-test", '1 failing JSC stress test '], 1, """Results for Mozilla tests:
- 0 regression found.
- 0 tests fixed.
+ self.assertResults(FAILURE, ["jscore-test", '1 failing JSC stress test '], 1, """Results for JSC stress tests:
+ 1 failure found.""")
-Results for LayoutTests/js tests:
- 0 failures found.
- 0 crashes found.
+ def test_jsc_stress_failures_new_output(self):
+ self.assertResults(FAILURE, ["jscore-test", '5 failing JSC stress tests '], 1, """Results for JSC stress tests:
+ 5 failures found.""")
-Results for JSC stress tests:
- 1 failures found.
- OK.""")
- def test_js_crashes_and_jsc_stress_failures_new_output(self):
- self.assertResults(FAILURE, ["jscore-test", '25 crashing js tests ', '284 failing JSC stress tests '], 1, """Results for Mozilla tests:
- 0 regression found.
- 0 tests fixed.
-
-Results for LayoutTests/js tests:
- 0 failures found.
- 25 crashes found.
-
-Results for JSC stress tests:
- 284 failures found.
- OK.""")
-
-
class RunUnitTestsTest(unittest.TestCase):
def assertFailures(self, expected_failure_count, stdio):
if expected_failure_count:
