1 files changed, 11 insertions, 0 deletions
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index 5ff4681..acedbd2 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -247,6 +247,9 @@ class RunWebKitTests(shell.Test):
 class NewRunWebKitTests(RunWebKitTests):
     command = ["python", "./WebKitTools/Scripts/new-run-webkit-tests", "--noshow-results",
                "--verbose", "--results-directory", "layout-test-results",
+               "--builder-name", WithProperties("%(buildername)s"),
+               "--build-number", WithProperties("%(buildnumber)s"),
+               "--test-results-server", "test-results.appspot.com",
                WithProperties("--%(configuration)s"), "--use-drt"]
 
 
@@ -306,6 +309,12 @@ class RunWebKitLeakTests(RunWebKitTests):
         return RunWebKitTests.start(self)
 
 
+class RunWebKit2Tests(RunWebKitTests):
+    def start(self):
+        self.setCommand(self.command + ["--webkit-test-runner"])
+        return RunWebKitTests.start(self)
+
+
 class ArchiveTestResults(shell.ShellCommand):
     command = ["python", "./WebKitTools/BuildSlaveSupport/test-result-archive",
                WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"), "archive"]
@@ -405,6 +414,8 @@ class BuildAndTestLeaksFactory(BuildAndTestFactory):
 class NewBuildAndTestFactory(BuildAndTestFactory):
     TestClass = NewRunWebKitTests
 
+class TestWebKit2Factory(TestFactory):
+    TestClass = RunWebKit2Tests
 
 def loadBuilderConfig(c):
     # FIXME: These file handles are leaked.