Skip to content
Snippets Groups Projects
Commit 0d7ba0ec authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

now counts all test cases and presents a counter at the end

parent b2f0ca8a
No related branches found
No related tags found
No related merge requests found
......@@ -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";
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment