Modified: trunk/Tools/Scripts/run-webkit-tests (98664 => 98665)
--- trunk/Tools/Scripts/run-webkit-tests 2011-10-28 00:18:55 UTC (rev 98664)
+++ trunk/Tools/Scripts/run-webkit-tests 2011-10-28 00:21:08 UTC (rev 98665)
@@ -89,24 +89,15 @@
if (runningOnBuildBot()) {
push(@ARGV, "--verbose");
}
+}
- # FIXME: We need a cleaner way to do --platform handling.
- # 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");
- }
-} 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");
- }
+# FIXME: We need a cleaner way to do --platform handling.
+# webkitdirs.pm strips --qt and --gtk from @ARGV when we call isQt/isGtk.
+# 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);
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (98664 => 98665)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-10-28 00:18:55 UTC (rev 98664)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-10-28 00:21:08 UTC (rev 98665)
@@ -189,6 +189,9 @@
const='Release', dest="configuration",
help='Set the configuration to Release'),
# old-run-webkit-tests also accepts -c, --configuration CONFIGURATION.
+ optparse.make_option("--platform", help="Override port/platform being tested (i.e. chromium-mac)"),
+ optparse.make_option('--qt', action='', const='qt', dest="platform", help='Alias for --platform=qt'),
+ optparse.make_option('--gtk', action='', const='gtk', dest="platform", help='Alias for --platform=gtk'),
]
print_options = printing.print_options()
@@ -263,8 +266,6 @@
]
results_options = [
- # NEED for bots: --use-remote-links-to-tests Link to test files
- # within the SVN repository in the results.
optparse.make_option("-p", "--pixel-tests", action=""
dest="pixel_tests", help="Enable pixel-to-pixel PNG comparisons"),
optparse.make_option("--no-pixel-tests", action=""
@@ -304,23 +305,13 @@
"are done"),
# FIXME: We should have a helper function to do this sort of
# deprectated mapping and automatically log, etc.
- optparse.make_option("--noshow-results", action=""
- dest="show_results",
- help="Deprecated, same as --no-show-results."),
- optparse.make_option("--no-launch-safari", action=""
- dest="show_results",
- help="old-run-webkit-tests compat, same as --noshow-results."),
- # old-run-webkit-tests:
- # --[no-]launch-safari Launch (or do not launch) Safari to display
- # test results (default: launch)
+ optparse.make_option("--noshow-results", action="" dest="show_results", help="Deprecated, same as --no-show-results."),
+ optparse.make_option("--no-launch-safari", action="" dest="show_results", help="Deprecated, same as --no-show-results."),
optparse.make_option("--full-results-html", action=""
default=False,
- help="Show all failures in results.html, rather than only "
- "regressions"),
+ help="Show all failures in results.html, rather than only regressions"),
optparse.make_option("--clobber-old-results", action=""
default=False, help="Clobbers test results from previous runs."),
- optparse.make_option("--platform",
- help="Override the platform for expected results"),
optparse.make_option("--no-record-results", action=""
default=True, dest="record_results",
help="Don't record the results."),
