Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (91515 => 91516)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-07-21 22:02:54 UTC (rev 91515)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-07-21 22:09:03 UTC (rev 91516)
@@ -195,9 +195,19 @@
name = "layout-test"
description = ["layout-tests running"]
descriptionDone = ["layout-tests"]
- command = ["perl", "./Tools/Scripts/run-webkit-tests", "--no-launch-safari", "--no-new-test-results",
- "--no-sample-on-timeout", "--results-directory", "layout-test-results", "--use-remote-links-to-tests",
- WithProperties("--%(configuration)s"), "--exit-after-n-crashes-or-timeouts", "20", "--exit-after-n-failures", "500"]
+ command = ["perl", "./Tools/Scripts/run-webkit-tests",
+ "--no-launch-safari",
+ "--no-new-test-results",
+ "--no-sample-on-timeout",
+ "--results-directory", "layout-test-results",
+ "--use-remote-links-to-tests",
+ "--builder-name", WithProperties("%(buildername)s"),
+ "--build-number", WithProperties("%(buildnumber)s"),
+ "--master-name", "webkit.org",
+ "--test-results-server", "test-results.appspot.com",
+ WithProperties("--%(configuration)s"),
+ "--exit-after-n-crashes-or-timeouts", "20",
+ "--exit-after-n-failures", "500"]
def __init__(self, buildJSCTool=True, *args, **kwargs):
self.buildJSCTool = buildJSCTool
Modified: trunk/Tools/ChangeLog (91515 => 91516)
--- trunk/Tools/ChangeLog 2011-07-21 22:02:54 UTC (rev 91515)
+++ trunk/Tools/ChangeLog 2011-07-21 22:09:03 UTC (rev 91516)
@@ -1,3 +1,17 @@
+2011-07-21 Adam Barth <[email protected]>
+
+ webkit.org builders should upload results to test-results AppEngine instance
+ https://bugs.webkit.org/show_bug.cgi?id=64979
+
+ Reviewed by Adam Roben.
+
+ The master just needs to pass some flags to NRWT. This patch also lets
+ ORWT consume the flags (ignoring them) so we can pass the flags
+ unconditionally.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ * Scripts/old-run-webkit-tests:
+
2011-07-21 Ojan Vafai <[email protected]>
normalize gtest names in the result json
Modified: trunk/Tools/Scripts/old-run-webkit-tests (91515 => 91516)
--- trunk/Tools/Scripts/old-run-webkit-tests 2011-07-21 22:02:54 UTC (rev 91515)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2011-07-21 22:09:03 UTC (rev 91516)
@@ -179,6 +179,12 @@
my $useWebKitTestRunner = 0;
my $noBuildDumpTool = 0;
+# These arguments are ignored, but exist for compatibility with new-run-webkit-tests.
+my $builderName = '';
+my $buildNumber = '';
+my $masterName = '';
+my $testResultsServer = '';
+
my @leaksFilenames;
if (isWindows() || isMsys()) {
@@ -371,6 +377,11 @@
'valgrind' => \$useValgrind,
'verbose|v' => \$verbose,
'webkit-test-runner|2' => \$useWebKitTestRunner,
+ # These arguments are ignored (but are used by new-run-webkit-tests).
+ 'builder-name' => \$builderName,
+ 'build-number' => \$buildNumber,
+ 'master-name' => \$masterName,
+ 'test-results-server' => \$testResultsServer,
);
if (!$getOptionsResult || $showHelp) {
