diff --git a/mozilla/webtools/tinderbox/processbuild.pl b/mozilla/webtools/tinderbox/processbuild.pl index 7fcd0f5df77..57223510dc5 100755 --- a/mozilla/webtools/tinderbox/processbuild.pl +++ b/mozilla/webtools/tinderbox/processbuild.pl @@ -136,8 +136,8 @@ sub check_required_vars { if( $tbx{'status'} eq ''){ $err_string .= "Variable 'tinderbox:status' not set.\n"; } - elsif( ! $tbx{'status'} =~ /success|busted|building/ ){ - $err_string .= "Variable 'tinderbox:status' must be 'success', 'busted' or 'building'\n"; + elsif( ! $tbx{'status'} =~ /success|busted|building|testfailed/ ){ + $err_string .= "Variable 'tinderbox:status' must be 'success', 'busted', 'testfailed', or 'building'\n"; } # @@ -173,7 +173,7 @@ sub compress_log_file { $done = ($line eq ''); } - $logfile = "$$.gz"; + $logfile = "$builddate.$$.gz"; open( ZIPLOG, "| $gzip -c > $tbx{'tree'}/$logfile" ) || die "can't open $! for writing"; $inBinary = 0; diff --git a/mozilla/webtools/tinderbox/showbuilds.cgi b/mozilla/webtools/tinderbox/showbuilds.cgi index e0063e9da8e..dd670f4654d 100755 --- a/mozilla/webtools/tinderbox/showbuilds.cgi +++ b/mozilla/webtools/tinderbox/showbuilds.cgi @@ -45,7 +45,8 @@ else { $colormap = { success => '00ff00', busted => 'red', - building => 'yellow' + building => 'yellow', + testfailed => 'orange' }; # @@ -130,8 +131,9 @@ $treename = $tree . ($tree2 ne "" ? " and $tree2" : "" ); print "C = Show changes that occured since the last build
"; print "B = Download binary generated by the build
"; print ""; - print "
Currently Building"; print "
Built successfully"; + print "
Currently Building"; + print "
Build Successful, Build Tests Failed"; print "
Build failed"; print "
"; print "";