Don't run test "forever" with mysql-test-run --valgrind

Test times when using --valgrind are now 4 hours and server start/shutdown
time 180 seconds.
The whole test suite time is caped at 1 day instead of 7 days

Reviewer: Monty

1 files changed, 11 insertions, 4 deletions

diff --git a/mysql-test/lib/My/Debugger.pm b/mysql-test/lib/My/Debugger.pm
index 5288f0740fa..2a5c9c63d96 100644
--- a/mysql-test/lib/My/Debugger.pm
+++ b/mysql-test/lib/My/Debugger.pm
@@ -45,6 +45,7 @@ my %debuggers = (
     script => 'set args {args} < {input}',
   },
   ddd => {
+    interactive => 1,
     options => '--command {script} {exe}',
     script => 'set args {args} < {input}',
   },
@@ -53,9 +54,11 @@ my %debuggers = (
     options => '-c "stop in main; run {exe} {args} < {input}"',
   },
   devenv => {
+    interactive => 1,
     options => '/debugexe {exe} {args}',
   },
   windbg => {
+    interactive => 1,
     options => '{exe} {args}',
   },
   lldb => {
@@ -190,11 +193,15 @@ sub fix_options(@) {
 
 sub pre_setup() {
   my $used;
+  my $interactive;
   for my $k (keys %debuggers) {
     for my $opt ($k, "manual-$k", "boot-$k", "client-$k") {
       if ($opt_vals{$opt})
       {
         $used = 1;
+        $interactive ||= ($debuggers{$k}->{interactive} ||
+                          $debuggers{$k}->{term} ||
+                          ($opt =~ /^manual-/));
         if ($debuggers{$k}->{pre}) {
           $debuggers{$k}->{pre}->();
           delete $debuggers{$k}->{pre};
@@ -209,10 +216,10 @@ sub pre_setup() {
 
     $::opt_retry= 1;
     $::opt_retry_failure= 1;
-    $::opt_testcase_timeout= 7 * 24 * 60; # in minutes
-    $::opt_suite_timeout= 7 * 24 * 60;    # in minutes
-    $::opt_shutdown_timeout= 24 * 60 *60; # in seconds
-    $::opt_start_timeout= 24 * 60 * 60;   # in seconds
+    $::opt_testcase_timeout= ($interactive ? 24 : 4) * 60;      # in minutes
+    $::opt_suite_timeout= 24 * 60;                              # in minutes
+    $::opt_shutdown_timeout= ($interactive ? 24 * 60 : 3) * 60; # in seconds
+    $::opt_start_timeout= $::opt_shutdown_timeout;              # in seconds
   }
 }