Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed my stupid mistake (theoretically) and increased the test timeout to 45 seconds.

Browse Source
This commit is contained in:
briano%netscape.com 1999-03-09 00:44:04 +00:00
parent 340a2d50b1
commit 975e9fd1dc
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/tinderbox/build-moz-ports.pl
View File

@ -6,7 +6,7 @@ use Sys::Hostname;
use POSIX "sys_wait_h";
use Cwd;
$Version = "1.060";
$Version = "1.080";
sub InitVars {
# PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
@ -79,7 +79,8 @@ sub SetupEnv {
} #EndSub-SetupEnv
sub SetupPath {
my($Path);
my($Path, $comptmp);
$comptmp = '';
$Path = $ENV{PATH};
print "Path before: $Path\n";
@ -161,7 +162,9 @@ sub SetupPath {
$ENV{'PATH'} = '/tools/ns/workshop/bin:/usrlocal/bin:' . $ENV{'PATH'};
$ENV{'LD_LIBRARY_PATH'} = '/tools/ns/workshop/lib:/usrlocal/lib:' . $ENV{'LD_LIBRARY_PATH'};
$ConfigureEnvArgs = 'CC=cc CXX=CC';
$Compiler = 'cc/CC (' . `cc -V 2>&1 | head -1` . ')';
$comptmp = `cc -V 2>&1 | head -1`;
chop($comptmp);
$Compiler = "cc/CC \($comptmp\)";
$NSPRArgs .= 'NS_USE_NATIVE=1';
} else {
$NSPRArgs .= 'NS_USE_GCC=1 NS_USE_NATIVE=';
@ -297,7 +300,8 @@ sub GetSystemInfo {
} #EndSub-GetSystemInfo
sub BuildIt {
my ($fe, @felist, $EarlyExit, $LastTime, $StartTimeStr);
my ($fe, @felist, $EarlyExit, $LastTime, $StartTimeStr, $comptmp);
$comptmp = '';
mkdir("$DirName", 0777);
chdir("$DirName") || die "Couldn't enter $DirName";
@ -340,7 +344,9 @@ sub BuildIt {
if ( $Compiler ne '' ) {
print LOG "===============================\n";
if ( $Compiler eq 'gcc' || $Compiler eq 'egcc' ) {
print LOG "Compiler is -- $Compiler \(" . `$Compiler --version` . "\)\n";
$comptmp = `$Compiler --version`;
chop($comptmp);
print LOG "Compiler is -- $Compiler \($comptmp\)\n";
} else {
print LOG "Compiler is -- $Compiler\n";
}
@ -701,7 +707,7 @@ sub RunSmokeTest {
my($fe) = @_;
my($Binary);
my($status) = 0;
my($waittime) = 30;
my($waittime) = 45;
my($pid) = fork;
$fe = 'x' if (!defined($fe));

18
tools/tinderbox/build-moz-smoke.pl
View File

@ -6,7 +6,7 @@ use Sys::Hostname;
use POSIX "sys_wait_h";
use Cwd;
$Version = "1.060";
$Version = "1.080";
sub InitVars {
# PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
@ -79,7 +79,8 @@ sub SetupEnv {
} #EndSub-SetupEnv
sub SetupPath {
my($Path);
my($Path, $comptmp);
$comptmp = '';
$Path = $ENV{PATH};
print "Path before: $Path\n";
@ -161,7 +162,9 @@ sub SetupPath {
$ENV{'PATH'} = '/tools/ns/workshop/bin:/usrlocal/bin:' . $ENV{'PATH'};
$ENV{'LD_LIBRARY_PATH'} = '/tools/ns/workshop/lib:/usrlocal/lib:' . $ENV{'LD_LIBRARY_PATH'};
$ConfigureEnvArgs = 'CC=cc CXX=CC';
$Compiler = 'cc/CC (' . `cc -V 2>&1 | head -1` . ')';
$comptmp = `cc -V 2>&1 | head -1`;
chop($comptmp);
$Compiler = "cc/CC \($comptmp\)";
$NSPRArgs .= 'NS_USE_NATIVE=1';
} else {
$NSPRArgs .= 'NS_USE_GCC=1 NS_USE_NATIVE=';
@ -297,7 +300,8 @@ sub GetSystemInfo {
} #EndSub-GetSystemInfo
sub BuildIt {
my ($fe, @felist, $EarlyExit, $LastTime, $StartTimeStr);
my ($fe, @felist, $EarlyExit, $LastTime, $StartTimeStr, $comptmp);
$comptmp = '';
mkdir("$DirName", 0777);
chdir("$DirName") || die "Couldn't enter $DirName";
@ -340,7 +344,9 @@ sub BuildIt {
if ( $Compiler ne '' ) {
print LOG "===============================\n";
if ( $Compiler eq 'gcc' || $Compiler eq 'egcc' ) {
print LOG "Compiler is -- $Compiler \(" . `$Compiler --version` . "\)\n";
$comptmp = `$Compiler --version`;
chop($comptmp);
print LOG "Compiler is -- $Compiler \($comptmp\)\n";
} else {
print LOG "Compiler is -- $Compiler\n";
}
@ -701,7 +707,7 @@ sub RunSmokeTest {
my($fe) = @_;
my($Binary);
my($status) = 0;
my($waittime) = 30;
my($waittime) = 45;
my($pid) = fork;
$fe = 'x' if (!defined($fe));