Commit a38e6730 authored by darin's avatar darin

Reviewed by John Sullivan.

        * Scripts/run-webkit-tests: Fix handling of configuration so it
        does the right thing when no explicit configuration is passed in.
        The old code assumed that the result of setConfiguration() was the
        configuration, but it's undefined when no configuration is
        explicitly passed in. The correct function to use is
        configuration(), and I also streamlined the code.



git-svn-id: svn://svn.chromium.org/blink/trunk@18948 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 823a7d62
2007-01-18 Darin Adler <darin@apple.com>
Reviewed by John Sullivan.
* Scripts/run-webkit-tests: Fix handling of configuration so it
does the right thing when no explicit configuration is passed in.
The old code assumed that the result of setConfiguration() was the
configuration, but it's undefined when no configuration is
explicitly passed in. The correct function to use is
configuration(), and I also streamlined the code.
2007-01-17 Lars Knoll <lars@trolltech.com> 2007-01-17 Lars Knoll <lars@trolltech.com>
Fix my last commit to actually work in all cases. Fix my last commit to actually work in all cases.
......
...@@ -144,7 +144,8 @@ my $usage = ...@@ -144,7 +144,8 @@ my $usage =
" --strict Do a comparison with the output on Mac (Qt only)\n"; " --strict Do a comparison with the output on Mac (Qt only)\n";
# Parse out build options (--debug or --release) first # Parse out build options (--debug or --release) first
my $buildConfiguration = setConfiguration(); setConfiguration();
my $configurationOption = "--" . lc configuration();
my $getOptionsResult = GetOptions( my $getOptionsResult = GetOptions(
'guard-malloc|g' => \$guardMalloc, 'guard-malloc|g' => \$guardMalloc,
...@@ -189,11 +190,7 @@ $productDir .= "/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj" if (isQt()); ...@@ -189,11 +190,7 @@ $productDir .= "/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj" if (isQt());
chdirWebKit(); chdirWebKit();
my @buildOptions = (); my $buildResult = system "WebKitTools/Scripts/build-dumprendertree", $configurationOption;
if ($buildConfiguration) {
push @buildOptions, '--' . lc($buildConfiguration);
}
my $buildResult = system "WebKitTools/Scripts/build-dumprendertree", @buildOptions;
exit WEXITSTATUS($buildResult) if $buildResult; exit WEXITSTATUS($buildResult) if $buildResult;
my $dumpToolName = "DumpRenderTree"; my $dumpToolName = "DumpRenderTree";
...@@ -753,7 +750,7 @@ close HTML; ...@@ -753,7 +750,7 @@ close HTML;
if(isQt()) { if(isQt()) {
system "konqueror", $testResults if $launchSafari; system "konqueror", $testResults if $launchSafari;
} else { } else {
system "WebKitTools/Scripts/run-safari", "--" . lc($buildConfiguration), "-NSOpen", $testResults if $launchSafari; system "WebKitTools/Scripts/run-safari", $configurationOption, "-NSOpen", $testResults if $launchSafari;
} }
exit 1; exit 1;
......
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