Title: [90449] trunk/Tools
- Revision
- 90449
- Author
- [email protected]
- Date
- 2011-07-06 04:03:56 -0700 (Wed, 06 Jul 2011)
Log Message
2011-07-06 Eric Seidel <[email protected]>
Unreviewed..
* Scripts/run-webkit-tests:
(useNewRunWebKitTests):
- Fix the pass-thru of --gtk and --qt for old-run-webkit-tests,
it was previously broken by the existence of isGtk/isQt checks which
removed the --gtk/--qt args from @ARGV.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90448 => 90449)
--- trunk/Tools/ChangeLog 2011-07-06 10:28:20 UTC (rev 90448)
+++ trunk/Tools/ChangeLog 2011-07-06 11:03:56 UTC (rev 90449)
@@ -1,5 +1,15 @@
2011-07-06 Eric Seidel <[email protected]>
+ Unreviewed..
+
+ * Scripts/run-webkit-tests:
+ (useNewRunWebKitTests):
+ - Fix the pass-thru of --gtk and --qt for old-run-webkit-tests,
+ it was previously broken by the existence of isGtk/isQt checks which
+ removed the --gtk/--qt args from @ARGV.
+
+2011-07-06 Eric Seidel <[email protected]>
+
new-run-webkit-tests uses a 35s timeout for Mac and 6s for all other ports
https://bugs.webkit.org/show_bug.cgi?id=63983
Modified: trunk/Tools/Scripts/run-webkit-tests (90448 => 90449)
--- trunk/Tools/Scripts/run-webkit-tests 2011-07-06 10:28:20 UTC (rev 90448)
+++ trunk/Tools/Scripts/run-webkit-tests 2011-07-06 11:03:56 UTC (rev 90449)
@@ -55,6 +55,8 @@
return $isBuildBotUser{$ENV{"USER"}};
}
+# We could use isWebKit2() instead of our own custom usingWebKit2(), but then
+# we'd have to be careful to add -2 or --webkit-test-runner back into @ARGV below.
sub usingWebKit2()
{
# If either -2 or --webkit-test-runner is passed, we're supposed to use WebKit2.
@@ -65,12 +67,16 @@
sub useNewRunWebKitTests()
{
- # Change this check to control which platforms use
- # new-run-webkit-tests by default.
+ # 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.
+
+ # Note: We use a whitelist here to avoid calling isPORT() for ports
+ # for which we haven't explicitly added support. Calling isPORT()
+ # will remove the --PORT argument from @ARGV, causing us to fail to pass it to the test harness.
+
# NRWT Windows support still needs work: https://bugs.webkit.org/show_bug.cgi?id=38756
- return (!isAnyWindows() and !usingWebKit2());
+ return ((isLeopard() or isSnowLeopard() or isQt() or isGtk()) and !usingWebKit2());
}
my $harnessName = "old-run-webkit-tests";
@@ -85,15 +91,22 @@
}
# FIXME: We need a cleaner way to do --platform handling.
- # One problem is that webkitdirs.pm strips --qt and --gtk from @ARGV when we call isQt/isGtk.
- # But new-run-webkit-tests wouldn't understand --qt/--gtk if we passed it to it anyway:
+ # webkitdirs.pm strips --qt and --gtk from @ARGV when we call isQt/isGtk.
+ # Unfortunately new-run-webkit-tests wouldn't understand --qt/--gtk if we passed it to it anyway,
+ # so we have to convert it to --platform=PORT equivalents.
# https://bugs.webkit.org/show_bug.cgi?id=63970
if (isQt()) {
push(@ARGV, "--platform=qt");
- }
- if (isGtk()) {
+ } elsif (isGtk()) {
push(@ARGV, "--platform=gtk");
}
+} else {
+ # We have to add back any --PORT arguments which may have been removed by isPort() checks above.
+ if (isQt()) {
+ push(@ARGV, "--qt");
+ } elsif (isGtk()) {
+ push(@ARGV, "--gtk");
+ }
}
my $harnessPath = File::Spec->catfile(relativeScriptsDir(), $harnessName);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
