1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 15:48:49 -05:00

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.
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

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
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

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

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

View File

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