Commit c0700e3c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

runtests: use a DISABLED.local file too 

... and have git ignore that. Allows for a dev to add tests to ignore in
local tests and yet don't obstruct a normal git work flow.
parent 92e754de

tests/README

+3 −1
Original line number Diff line number Diff line
@@ -100,7 +100,9 @@ The cURL Test Suite 
  (like "./runtests.pl 3 4" to test 3 and 4 only). It also supports test case

  ranges with 'to', as in "./runtests 3 to 9" which runs the seven tests from

  3 to 9. Any test numbers starting with ! are disabled, as are any test

  numbers found in the file data/DISABLED (one per line).

  numbers found in the files data/DISABLED or data/DISABLED.local (one per

  line). The latter is meant for local temporary disables and will be ignored

  by git.



  When -s is not present, each successful test will display on one line the

  test number and description and on the next line a set of flags, the test

tests/data/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
DISABLED.local

tests/runtests.pl

+19 −9
Original line number Diff line number Diff line
@@ -5002,7 +5002,10 @@ if(!$listonly) { 
# Fetch all disabled tests, if there are any

#



if(open(D, "<$TESTDIR/DISABLED")) {

sub disabledtests {

    my ($file) = @_;



    if(open(D, "<$file")) {

        while(<D>) {

            if(/^ *\#/) {

                # allow comments
@@ -5014,6 +5017,13 @@ if(open(D, "<$TESTDIR/DISABLED")) { 
        }

        close(D);

    }

}



# 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