generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

runtests: use a DISABLED.local file too

Browse Source 
... 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.
This commit is contained in:
Daniel Stenberg 2015-04-26 18:22:46 +02:00
parent 92e754de78
commit c0700e3c7f
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/README
View File

@ -100,7 +100,9 @@ The cURL Test Suite
(like "./runtests.pl 3 4" to test 3 and 4 only). It also supports test case (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 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 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 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 test number and description and on the next line a set of flags, the test

1
tests/data/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
DISABLED.local

28
tests/runtests.pl
View File

@ -5002,19 +5002,29 @@ if(!$listonly) {
# Fetch all disabled tests, if there are any # Fetch all disabled tests, if there are any
# #
if(open(D, "<$TESTDIR/DISABLED")) { sub disabledtests {
while(<D>) { my ($file) = @_;
if(/^ *\#/) {
# allow comments if(open(D, "<$file")) {
next; while(<D>) {
} if(/^ *\#/) {
if($_ =~ /(\d+)/) { # allow comments
$disabled{$1}=$1; # disable this test number next;
}
if($_ =~ /(\d+)/) {
$disabled{$1}=$1; # disable this test number
}
} }
close(D);
} }
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 # If 'all' tests are requested, find out all test numbers
# #