Changeset 90449 in webkit

Timestamp:

Jul 6, 2011, 4:03:56 AM (15 years ago)

Author:

eric@webkit.org

Message:

2011-07-06 Eric Seidel <​eric@webkit.org>

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-webkit-tests (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-06  Eric Seidel  <eric@webkit.org>
+
+        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  <eric@webkit.org>
 

trunk/Tools/Scripts/run-webkit-tests

@@ -56 +56 @@
 }
 
+# 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()
 {
@@ -66 +68 @@
 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());
 }
 
@@ -86 +92 @@
 
     # 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");
+    } elsif (isGtk()) {
+        push(@ARGV, "--platform=gtk");
     }
-    if (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");
     }
 }