diff options
| -rwxr-xr-x | tests/runtests.pl | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index c47f2ad17..deb9311fa 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -346,6 +346,7 @@ sub singletest { if(! -r $CURLCMD) { # this is not a test + print "$NUMBER doesn't look like a test case!\n"; next; } @@ -606,7 +607,7 @@ runftpserver($verbose); if ( $TESTCASES eq "all") { # Get all commands and find out their test numbers opendir(DIR, $TESTDIR) || die "can't opendir $TESTDIR: $!"; - my @cmds = grep { /^command/ && -f "$TESTDIR/$_" } readdir(DIR); + my @cmds = grep { /^command([0-9]+).txt/ && -f "$TESTDIR/$_" } readdir(DIR); closedir DIR; $TESTCASES=""; # start with no test cases @@ -632,13 +633,20 @@ open(CMDLOG, ">$CURLLOG") || # my $testnum; +my $ok=0; +my $total=0; foreach $testnum (split(" ", $TESTCASES)) { - if(singletest($testnum) && !$anyway) { + $total++; + my $error = singletest($testnum); + if($error && !$anyway) { # a test failed, abort print "\n - abort tests\n"; last; } + elsif(!$error) { + $ok++; + } # loop for next test } @@ -655,3 +663,4 @@ close(CMDLOG); stopserver($FTPPIDFILE); stopserver($PIDFILE); +print "$ok tests out of $total reported OK\n"; |