Title: [90217] trunk/Tools
- Revision
- 90217
- Author
- [email protected]
- Date
- 2011-07-01 00:52:20 -0700 (Fri, 01 Jul 2011)
Log Message
2011-07-01 Sheriff Bot <[email protected]>
Unreviewed, rolling out r90213.
http://trac.webkit.org/changeset/90213
https://bugs.webkit.org/show_bug.cgi?id=63792
The SL bot has an errant HTTP server holding port 8080
(Requested by abarth on #webkit).
* Scripts/run-webkit-tests:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90216 => 90217)
--- trunk/Tools/ChangeLog 2011-07-01 07:50:49 UTC (rev 90216)
+++ trunk/Tools/ChangeLog 2011-07-01 07:52:20 UTC (rev 90217)
@@ -1,3 +1,14 @@
+2011-07-01 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r90213.
+ http://trac.webkit.org/changeset/90213
+ https://bugs.webkit.org/show_bug.cgi?id=63792
+
+ The SL bot has an errant HTTP server holding port 8080
+ (Requested by abarth on #webkit).
+
+ * Scripts/run-webkit-tests:
+
2011-07-01 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix WebKit2 GTK build after r90163.
Modified: trunk/Tools/Scripts/run-webkit-tests (90216 => 90217)
--- trunk/Tools/Scripts/run-webkit-tests 2011-07-01 07:50:49 UTC (rev 90216)
+++ trunk/Tools/Scripts/run-webkit-tests 2011-07-01 07:52:20 UTC (rev 90217)
@@ -55,32 +55,28 @@
return $isBuildBotUser{$ENV{"USER"}};
}
-sub usingWebKit2()
-{
- # If either -2 or --webkit-test-runner is passed, we're supposed to use WebKit2.
- # NRWT's WebKit2 support is still a work in progress:
- # https://bugs.webkit.org/show_bug.cgi?id=56729
- return grep(/(-2|--webkit-test-runner)/, @ARGV);
-}
-
sub useNewRunWebKitTests()
{
# Change this check to control which platforms use
# new-run-webkit-tests by default.
# Example: return runningOnBuildBot() && isLeopard();
# would enable new-run-webkit-tests on only the leopard buildbots.
- return (isSnowLeopard() and !usingWebKit2());
+ return 0;
}
my $harnessName = "old-run-webkit-tests";
if (useNewRunWebKitTests()) {
$harnessName = "new-run-webkit-tests";
- push(@ARGV, "--child-processes=1");
- print "Running new-run-webkit-tests with one child process.\n";
- print "For more parallelism, run new-run-webkit-tests directly.\n";
if (runningOnBuildBot()) {
push(@ARGV, "--verbose");
+ # old-run-webkit-tests treats --results-directory as $CWD relative.
+ # new-run-webkit-tests treats --results-directory as build directory relative.
+ # Override the passed in --results-directory by appending a new one
+ # (later arguments override earlier ones in Python's optparse).
+ push(@ARGV, "--results-directory");
+ # The buildbot always uses $SRCDIR/layout-test-results, hardcode it:
+ push(@ARGV, sourceDir() . "/layout-test-results");
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
