Fix some strange behavior resulting from using arrays of arrays instead of just arrays. (These have been on gruff for ages.)

This commit is contained in:
dbaron%dbaron.org 2004-11-24 21:13:51 +00:00
Родитель 492b719cbf
Коммит c0d058d767
1 изменённых файлов: 14 добавлений и 16 удалений

Просмотреть файл

@ -24,7 +24,7 @@ use Config; # for $Config{sig_name} and $Config{sig_num}
use File::Find (); use File::Find ();
use File::Copy; use File::Copy;
$::UtilsVersion = '$Revision: 1.285 $ '; $::UtilsVersion = '$Revision: 1.286 $ ';
package TinderUtils; package TinderUtils;
@ -1785,15 +1785,15 @@ sub run_all_tests {
# Bloat test (based on nsTraceRefcnt) # Bloat test (based on nsTraceRefcnt)
if ($Settings::BloatTest and $test_result eq 'success') { if ($Settings::BloatTest and $test_result eq 'success') {
my @app_args; my $app_args;
if($Settings::BinaryName eq "TestGtkEmbed" || if($Settings::BinaryName eq "TestGtkEmbed" ||
$Settings::BinaryName =~ /^firefox/) { $Settings::BinaryName =~ /^firefox/) {
@app_args = ["resource:///res/bloatcycle.html"]; $app_args = ["resource:///res/bloatcycle.html"];
} else { } else {
@app_args = ["-f", "bloaturls.txt"]; $app_args = ["-f", "bloaturls.txt"];
} }
$test_result = BloatTest($binary, $build_dir, $test_result = BloatTest($binary, $build_dir,
@app_args, "", $app_args, "",
$Settings::BloatTestTimeout); $Settings::BloatTestTimeout);
} }
@ -1880,17 +1880,15 @@ sub run_all_tests {
# Layout performance test. # Layout performance test.
if ($Settings::LayoutPerformanceTest and $test_result eq 'success') { if ($Settings::LayoutPerformanceTest and $test_result eq 'success') {
my @app_args; my $app_args = [$binary];
if($Settings::BinaryName eq "TestGtkEmbed" || unless ($Settings::BinaryName eq "TestGtkEmbed" ||
$Settings::BinaryName =~ /^firefox/) { $Settings::BinaryName =~ /^firefox/) {
@app_args = [$binary]; push(@$app_args, "-P", $Settings::MozProfileName);
} else {
@app_args = [$binary, "-P", $Settings::MozProfileName];
} }
$test_result = LayoutPerformanceTest("LayoutPerformanceTest", $test_result = LayoutPerformanceTest("LayoutPerformanceTest",
$build_dir, $build_dir,
@app_args); $app_args);
} }
# DHTML performance test. # DHTML performance test.
@ -1968,17 +1966,17 @@ sub run_all_tests {
$startup_build_dir = $win32_build_dir; $startup_build_dir = $win32_build_dir;
} }
my @app_args; my $app_args;
if($Settings::BinaryName eq "TestGtkEmbed") { if($Settings::BinaryName eq "TestGtkEmbed") {
@app_args = []; $app_args = [];
} else { } else {
@app_args = ["-P", $Settings::MozProfileName]; $app_args = ["-P", $Settings::MozProfileName];
} }
$test_result = StartupPerformanceTest("StartupPerformanceTest", $test_result = StartupPerformanceTest("StartupPerformanceTest",
$binary, $binary,
$startup_build_dir, $startup_build_dir,
@app_args, $app_args,
"file:$startup_build_dir/../startup-test.html"); "file:$startup_build_dir/../startup-test.html");
} }
return $test_result; return $test_result;