Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-factoring the last fix into the existing function xp_path().

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@131860 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pschwartau%netscape.com
2002-10-12 01:57:16 +00:00
parent bddb4eb769
commit 48b2acdc84
1 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
mozilla/js/tests/jsDriver.pl
View File

@@ -606,11 +606,7 @@ sub get_xpc_engine_command {
$m5_home .= "/";
}
if ($os_type eq "WIN") {
$m5_home = &get_win_path ($m5_home);
}
return $m5_home . "xpcshell";
return &xp_path($m5_home . "xpcshell");
}
@@ -692,11 +688,7 @@ sub get_sm_engine_command {
die (&xp_path($retval) . " is not a valid executable on this system.\n");
}
if ($os_type eq "WIN") {
$retval = &get_win_path ($retval);
}
return $retval;
return &xp_path($retval);
}
@@ -753,11 +745,7 @@ sub get_dd_engine_command {
}
}
if ($os_type eq "WIN") {
$retval = &get_win_path ($retval);
}
return $retval;
return &xp_path($retval);
}
#
@@ -808,11 +796,7 @@ sub get_lc_engine_command {
die ("$retval is not a valid executable on this system.\n");
}
if ($os_type eq "WIN") {
$retval = &get_win_path ($retval);
}
return $retval;
return &xp_path($retval);
}
@@ -835,27 +819,6 @@ sub get_os_type {
}
#
# Windows shells require "/" or "\" as path separator.
# Use the one required for the shell we're in.
#
sub get_win_path {
my ($path) = @_;
my $win_sep = &get_win_sep;
$path =~ s/$path_sep/$win_sep/g;
return $path;
}
#
# Windows shells require "/" or "\" as path separator.
# Find out the one used in our Windows shell.
#
sub get_win_sep {
my $path = $ENV{"PATH"} || $ENV{"Path"} || $ENV{"path"};
$path =~ /\\|\//;
return $&;
}
sub get_test_list {
my @test_list;
my @neg_list;
@@ -1123,6 +1086,26 @@ sub unix_to_mac {
return $rv;
}
#
# Convert unix path to win style.
#
sub unix_to_win {
my ($path) = @_;
my $win_sep = &get_win_sep;
$path =~ s/$path_sep/$win_sep/g;
return $path;
}
#
# Windows shells require "/" or "\" as path separator.
# Find out the one used in the current Windows shell.
#
sub get_win_sep {
my $path = $ENV{"PATH"} || $ENV{"Path"} || $ENV{"path"};
$path =~ /\\|\//;
return $&;
}
#
# Convert unix path to correct style based on platform.
#
@@ -1131,6 +1114,8 @@ sub xp_path {
if ($os_type eq "MAC") {
return &unix_to_mac($path);
} elsif($os_type eq "WIN") {
return &unix_to_win($path);
} else {
return $path;
}