X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2Ftest-driver;h=a10323bb177a938ff2c311ff9b69e6b4eb812361;hb=e3685c4c9aad38851097cff877dc0fb7ed47ab10;hp=6945eb9b4884a69efa251ef91a744a2db283da3f;hpb=5fbc1cd095d81ec77d8e5b66751b174d2870fe0f;p=mono.git

diff --git a/mono/tests/test-driver b/mono/tests/test-driver
index 6945eb9b488..a10323bb177 100755
--- a/mono/tests/test-driver
+++ b/mono/tests/test-driver
@@ -27,13 +27,15 @@ if ($test =~ /.*\|.*/) {
 	$output = $test;
 
 	#This is a silly workaround, but all tests that use extra parameters need a larger timeout.
-	$timeout_in_minutes = 5;
+	$timeout_in_minutes = 15;
 }
+$ENV{'TEST_DRIVER_TIMEOUT_SEC'} = $timeout_in_minutes * 60;
 
 $| = 0;
 print "Testing $test... ";
 
 foreach $disabled (split (/ /, $disabled_tests)) {
+	$disabled =~ s/^\s+|\s+$//g;
 	if ($disabled eq $test) {
 		print "disabled.\n";
 		exit (0);