Commit a1fa759a authored by ddkilzer@apple.com's avatar ddkilzer@apple.com

Clean up configuration usage in run-webkit-tests

        Reviewed by Adam.

        * Scripts/run-webkit-tests: Parse configuration switches using
        passedConfiguration() from webkitdirs.pm like every other script.
        Note that we must still call setConfiguration() afterwards in
        case the --configuration switch was used.  Use $configurationOption
        when running build-dumprendertree instead of recreating the switch.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32767 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a55698b8
2008-05-01 David Kilzer <ddkilzer@apple.com>
Clean up configuration usage in run-webkit-tests
Reviewed by Adam.
* Scripts/run-webkit-tests: Parse configuration switches using
passedConfiguration() from webkitdirs.pm like every other script.
Note that we must still call setConfiguration() afterwards in
case the --configuration switch was used. Use $configurationOption
when running build-dumprendertree instead of recreating the switch.
2008-04-29 Adam Roben <aroben@apple.com> 2008-04-29 Adam Roben <aroben@apple.com>
Restore the beloved COMPtr::operator& Restore the beloved COMPtr::operator&
......
...@@ -203,9 +203,15 @@ Usage: $programName [options] [testdir|testpath ...] ...@@ -203,9 +203,15 @@ Usage: $programName [options] [testdir|testpath ...]
-m|--merge-leak-depth arg Merges leak callStacks and prints the number of unique leaks beneath a callstack depth of arg. Defaults to 5. -m|--merge-leak-depth arg Merges leak callStacks and prints the number of unique leaks beneath a callstack depth of arg. Defaults to 5.
EOF EOF
# Process @ARGV for configuration switches before calling GetOptions()
if (my $passedConfiguration = passedConfiguration()) {
$configuration = $passedConfiguration;
} else {
$configuration = configuration();
}
my $getOptionsResult = GetOptions( my $getOptionsResult = GetOptions(
'c|configuration=s' => \$configuration, 'c|configuration=s' => \$configuration,
'debug|devel' => sub { $configuration = "Debug" },
'guard-malloc|g' => \$guardMalloc, 'guard-malloc|g' => \$guardMalloc,
'help' => \$showHelp, 'help' => \$showHelp,
'horizontal-sweep|h' => \$repaintSweepHorizontally, 'horizontal-sweep|h' => \$repaintSweepHorizontally,
...@@ -217,7 +223,6 @@ my $getOptionsResult = GetOptions( ...@@ -217,7 +223,6 @@ my $getOptionsResult = GetOptions(
'platform=s' => \$platform, 'platform=s' => \$platform,
'port=i' => \$httpdPort, 'port=i' => \$httpdPort,
'quiet|q' => \$quiet, 'quiet|q' => \$quiet,
'release|deploy' => sub { $configuration = "Release" },
'repaint-tests|r' => \$repaintTests, 'repaint-tests|r' => \$repaintTests,
'reset-results' => \$resetResults, 'reset-results' => \$resetResults,
'new-test-results!' => \$generateNewResults, 'new-test-results!' => \$generateNewResults,
...@@ -284,7 +289,7 @@ chdirWebKit(); ...@@ -284,7 +289,7 @@ chdirWebKit();
if(!defined($root)){ if(!defined($root)){
# Push the parameters to build-dumprendertree as an array # Push the parameters to build-dumprendertree as an array
my @args; my @args;
push(@args, "--" . $configuration); push(@args, $configurationOption);
push(@args, "--qt") if isQt(); push(@args, "--qt") if isQt();
push(@args, "--gtk") if isGtk(); push(@args, "--gtk") if isGtk();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment