Configurable timeout for layout test.

tools/tinderbox/build-seamonkey-util.pl

@@ -18,7 +18,7 @@ use POSIX qw(sys_wait_h strftime);
 use Cwd;
 use File::Basename; # for basename();
 use Config; # for $Config{sig_name} and $Config{sig_num}
-$::UtilsVersion = '$Revision: 1.36 $ ';
+$::UtilsVersion = '$Revision: 1.37 $ ';
 
 package TinderUtils;
 
@@ -764,12 +764,10 @@ sub run_all_tests {
 
 	# Layout performance test.
     if ($Settings::LayoutPerformanceTest and $test_result eq 'success') {
-      print_log "Page-loader performance test goes here.\n";
-	  print_log "Running LayoutPerformanceTest ...\n";
 	  $test_result = AliveTest("LayoutPerformanceTest", $build_dir,
 							   $binary, 
 							   "\"http://jrgm.mcom.com/page-loader/loader.pl?delay=1000&nocache=0&maxcycle=0\"",
-							   900);
+							   $Settings::LayoutPerformanceTestTimeout);
     }
 	# "http://jrgm.mcom.com/page-loader/loader.pl?delay=1000&nocache=0&maxcycle=0", 
     return $test_result;

tools/tinderbox/tinder-defaults.pl

@@ -27,6 +27,7 @@ $MozConfigFileName = 'mozconfig';
 $MozProfileName = 'default';
 $BloatTestTimeout  = 120;    # seconds
 $DomTestTimeout	   = 45;     # seconds
+$LayoutPerformanceTestTimeout  = 1200;    # seconds
 
 #- Set these to what makes sense for your system
 $Make          = 'gmake';       # Must be GNU make