diff --git a/tests/runtests.pl b/tests/runtests.pl index 864a344f9e..b5a2b4df9c 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -2346,12 +2346,10 @@ if(@ARGV && $ARGV[-1] eq '$TFLAGS') { push(@ARGV, split(' ', $ENV{'TFLAGS'})) if defined($ENV{'TFLAGS'}); } -if($ENV{"CURL_TEST_MIN"}) { - $mintotal = $ENV{"CURL_TEST_MIN"}; -} - $args = join(' ', @ARGV); +my $mintotalany = 0; + $valgrind = checktestcmd("valgrind"); my $number = 0; my $fromnum = -1; @@ -2450,6 +2448,7 @@ while(@ARGV) { elsif($ARGV[0] =~ /--min=(\d+)/) { my ($num) = ($1); $mintotal = $num; + $mintotalany = 1; } elsif($ARGV[0] eq "-n") { # no valgrind @@ -2761,6 +2760,13 @@ if(!$jobs) { setlogfunc(\&logmsg); } +if(!$mintotalany && $ENV{"CURL_TEST_MIN"}) { + $mintotal = $ENV{"CURL_TEST_MIN"}; + if($useshares) { + $mintotal /= $useshares; + } +} + ####################################################################### # Output curl version and host info being tested #