Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (215107 => 215108)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2017-04-07 19:03:59 UTC (rev 215107)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2017-04-07 19:06:51 UTC (rev 215108)
@@ -20,6 +20,8 @@
{ "name": "bot417", "platform": "mac-elcapitan" },
{ "name": "bot418", "platform": "mac-elcapitan" },
{ "name": "bot419", "platform": "mac-elcapitan" },
+ { "name": "bot433", "platform": "mac-elcapitan" },
+ { "name": "bot434", "platform": "mac-elcapitan" },
{ "name": "bot118", "platform": "mac-sierra" },
{ "name": "bot121", "platform": "mac-sierra" },
@@ -138,7 +140,7 @@
},
{ "name": "Apple El Capitan Debug (Build)", "type": "Build", "builddir": "elcapitan-debug",
"platform": "mac-elcapitan", "configuration": "debug", "architectures": ["x86_64"],
- "triggers": ["elcapitan-debug-tests-jsc", "elcapitan-debug-tests-wk1", "elcapitan-debug-tests-wk2"],
+ "triggers": ["elcapitan-debug-tests-jsc", "elcapitan-debug-tests-test262", "elcapitan-debug-tests-wk1", "elcapitan-debug-tests-wk2"],
"slavenames": ["bot415", "bot416"]
},
{ "name": "Apple El Capitan CMake Debug (Build)", "type": "Build", "builddir": "elcapitan-cmake-debug",
@@ -160,6 +162,10 @@
"additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
"slavenames": ["bot162", "bot165"]
},
+ { "name": "Apple El Capitan Debug Test262 (Tests)", "type": "Test262", "builddir": "elcapitan-debug-tests-test262",
+ "platform": "mac-elcapitan", "configuration": "debug", "architectures": ["x86_64"],
+ "slavenames": ["bot433"]
+ },
{ "name": "Apple El Capitan LLINT CLoop (BuildAndTest)", "type": "BuildAndTestLLINTCLoop", "builddir": "elcapitan-cloop-debug",
"platform": "mac-elcapitan", "configuration": "debug", "architectures": ["x86_64"],
"slavenames": ["bot169"]
@@ -170,7 +176,7 @@
},
{ "name": "Apple El Capitan Release (Build)", "type": "Build", "builddir": "elcapitan-release",
"platform": "mac-elcapitan", "configuration": "release", "architectures": ["x86_64"],
- "triggers": ["elcapitan-release-tests-jsc", "elcapitan-release-tests-wk1", "elcapitan-release-tests-wk2", "elcapitan-release-perf"],
+ "triggers": ["elcapitan-release-tests-jsc", "elcapitan-release-tests-test262", "elcapitan-release-tests-wk1", "elcapitan-release-tests-wk2", "elcapitan-release-perf"],
"slavenames": ["bot417", "bot418"]
},
{ "name": "Apple El Capitan Release JSC (Tests)", "type": "TestJSC", "builddir": "elcapitan-release-tests-jsc",
@@ -196,6 +202,10 @@
"platform": "mac-elcapitan", "configuration": "release", "architectures": ["i386"],
"slavenames": ["bot419"]
},
+ { "name": "Apple El Capitan Release Test262 (Tests)", "type": "Test262", "builddir": "elcapitan-release-tests-test262",
+ "platform": "mac-elcapitan", "configuration": "release", "architectures": ["x86_64"],
+ "slavenames": ["bot434"]
+ },
{
"name": "Apple iOS 10 Release (Build)", "type": "Build", "builddir": "ios-10-release",
"platform": "ios-10", "configuration": "release", "architectures": ["armv7s", "arm64"],
@@ -403,6 +413,12 @@
{ "type": "Triggerable", "name": "elcapitan-release-perf",
"builderNames": ["Apple El Capitan Release WK2 (Perf)"]
},
+ { "type": "Triggerable", "name": "elcapitan-debug-tests-test262",
+ "builderNames": ["Apple El Capitan Debug Test262 (Tests)"]
+ },
+ { "type": "Triggerable", "name": "elcapitan-release-tests-test262",
+ "builderNames": ["Apple El Capitan Release Test262 (Tests)"]
+ },
{ "type": "Triggerable", "name": "ios-simulator-10-release-tests-wk1",
"builderNames": ["Apple iOS 10 Simulator Release WK1 (Tests)"]
},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (215107 => 215108)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2017-04-07 19:03:59 UTC (rev 215107)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2017-04-07 19:06:51 UTC (rev 215108)
@@ -140,6 +140,34 @@
5 failures found.""")
+class RunTest262TestsTest(unittest.TestCase):
+ def assertResults(self, expected_result, expected_text, rc, stdio):
+ cmd = StubRemoteCommand(rc, stdio)
+ step = RunTest262Tests()
+ 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_no_regressions_output(self):
+ self.assertResults(SUCCESS, ["test262-test"], 0, """Using the following jsc path: /WebKitBuild/Release/jsc
+168/168 """)
+
+ def test_failure_output(self):
+ self.assertResults(FAILURE, ["1 Test262 test failed"], 1, """Using the following jsc path: /WebKitBuild/Release/jsc
+test262.yaml/test262/test/built-ins/Array/from/iter-set-elem-prop-err.js.default: ERROR: Unexpected exit code: 0
+test262.yaml/test262/test/built-ins/Array/from/iter-set-elem-prop-err.js.default-strict: ERROR: Unexpected exit code: 0
+...
+43768/43768 (failed 1) """)
+
+ def test_failures_output(self):
+ self.assertResults(FAILURE, ["75 Test262 tests failed"], 75, """Using the following jsc path: /WebKitBuild/Release/jsc
+...
+43768/43768 (failed 75) """)
+
+
class RunLLINTCLoopTestsTest(unittest.TestCase):
def assertResults(self, expected_result, expected_text, rc, stdio):
cmd = StubRemoteCommand(rc, stdio)
@@ -374,6 +402,7 @@
'Apple El Capitan CMake Debug (Build)' :['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
'Apple El Capitan Debug (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
'Apple El Capitan Debug JSC (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'jscore-test'],
+ 'Apple El Capitan Debug Test262 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'test262-test'],
'Apple El Capitan Debug WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
'Apple El Capitan Debug WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
'Apple El Capitan LLINT CLoop (BuildAndTest)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'webkit-jsc-cloop-test'],
@@ -381,6 +410,7 @@
'Apple El Capitan Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
'Apple El Capitan Release WK2 (Perf)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'perf-test'],
'Apple El Capitan Release JSC (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'jscore-test'],
+ 'Apple El Capitan Release Test262 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'test262-test'],
'Apple El Capitan Release WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
'Apple El Capitan Release WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],