runtests: call timestampskippedevents() in singletest

..rather than by the runner

diff --git a/tests/runner.pm b/tests/runner.pm
index 5d6aba3667b535f4927b7260a209d9296eee953b..8ada81d91eb21bf8f2c87b0661d92d8e08b8d7d0 100644 (file)
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -105,13 +105,6 @@ sub prepro {
     return main::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
@@ -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 9dc9eb1345a47795bc07bd351ca2b876ef5e3bf0..683f38c4137960f84fe81a6b1a09adbcc8431443 100755 (executable)
--- 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) {