Unverified Commit 5cc51b0d authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

runtests: ignore disabled even when ranges are given 

runtests.pl support running a range of tests, like "44 to 127". Starting
now, the code makes sure that even such given ranges will ignore tests
that are marked as disabled.

Disabled tests can still be run by explictly specifying that test
number.

Closes #3075
parent d9a2dc9a

tests/runtests.pl

+17 −8
Original line number Diff line number Diff line
@@ -5215,6 +5215,12 @@ sub runtimestats { 
    logmsg "\n";

}



# globally disabled tests

disabledtests("$TESTDIR/DISABLED");



# locally disabled tests, ignored by git etc

disabledtests("$TESTDIR/DISABLED.local");



#######################################################################

# Check options to this test program

#
@@ -5369,8 +5375,17 @@ EOHELP 
    elsif($ARGV[0] =~ /^(\d+)/) {

        $number = $1;

        if($fromnum >= 0) {

            for($fromnum .. $number) {

                push @testthis, $_;

            for my $n ($fromnum .. $number) {

                if($disabled{$n}) {

                    # skip disabled test cases

                    my $why = "configured as DISABLED";

                    $skipped++;

                    $skipped{$why}++;

                    $teststat[$n]=$why; # store reason for this test case

                }

                else {

                    push @testthis, $n;

                }

            }

            $fromnum = -1;

        }
@@ -5528,12 +5543,6 @@ sub disabledtests { 
    }

}



# globally disabled tests

disabledtests("$TESTDIR/DISABLED");



# locally disabled tests, ignored by git etc

disabledtests("$TESTDIR/DISABLED.local");



#######################################################################

# If 'all' tests are requested, find out all test numbers

#