Merge pull request #4998 from kumpera/fix_56684

[mono.git] / mono / tests / test-driver

diff --git a/mono/tests/test-driver b/mono/tests/test-driver
index 6945eb9b4884a69efa251ef91a744a2db283da3f..a10323bb177a938ff2c311ff9b69e6b4eb812361 100755 (executable)
--- 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);