diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2023-04-14 16:25:54 -0700 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2023-04-18 13:18:17 -0700 |
| commit | ba51b3973256e2250f536f32ef897d851a45744d (patch) | |
| tree | fe0475c9a4bee8141474929c7824c38ecd52f86c /tests | |
| parent | 43b876d7dfbd1317ea91a8e3126c60e4c550b047 (diff) | |
| download | curl-ba51b3973256e2250f536f32ef897d851a45744d.tar.gz | |
runtests: call timestampskippedevents() in singletest
..rather than by the runner
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/runner.pm | 10 | ||||
| -rwxr-xr-x | tests/runtests.pl | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/tests/runner.pm b/tests/runner.pm index 5d6aba366..8ada81d91 100644 --- a/tests/runner.pm +++ b/tests/runner.pm @@ -106,13 +106,6 @@ sub prepro { } ####################################################################### -# Call main's timestampskippedevents -# TODO: figure out where this should live -sub timestampskippedevents { - return main::timestampskippedevents(@_); -} - -####################################################################### # Call main's runclient # TODO: move this into a helper package sub runclient { @@ -493,7 +486,6 @@ sub singletest_prepare { if(@inputfile || $filename) { if(!$filename) { logmsg "ERROR: section client=>file has no name attribute\n"; - timestampskippedevents($testnum); return -1; } my $fileContent = join('', @inputfile); @@ -631,7 +623,6 @@ sub singletest_run { if(! -f $CMDLINE) { logmsg "The tool set in the test case for this: '$tool' does not exist\n"; - timestampskippedevents($testnum); return (-1, 0, 0, "", "", 0); } $DBGCURL=$CMDLINE; @@ -639,7 +630,6 @@ sub singletest_run { if($fail_due_event_based) { logmsg "This test cannot run event based\n"; - timestampskippedevents($testnum); return (-1, 0, 0, "", "", 0); } diff --git a/tests/runtests.pl b/tests/runtests.pl index 9dc9eb134..683f38c41 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -1851,6 +1851,7 @@ sub singletest { return $errorreturncode; } elsif($error == -2) { + timestampskippedevents($testnum); return $error; } elsif($error > 0) { |