Changeset ebb444 in git

Timestamp:

Sep 25, 2011, 4:13:56 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

c515addbdee3daf91cdb80efb76e41fd8ff2f111

Parents:

93e538c4b38681efb7cb7bfb840f6f5c5ff4002a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-25 16:13:56+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:28+01:00

Message:

ADD: detailed error reporting to TC!

File:

• Tst/regress.cmd (modified) (12 diffs)

Tst/regress.cmd

@@ -219 +219 @@
   putTCmsgNV( "blockClosed", "name", $v);
 }
-sub tcLog
-{ 
-  local($text) = $_[0];
-  putTCmsgNV2( "message", "text", $text, "status", "NORMAL"); 
-}
-sub tcWarn
-{ 
-  local($text) = $_[0];
-  putTCmsgNV2( "message", "text", $text, "status", "WARNING"); 
-}
 sub tcError
 { 
-  local($n) = tc_filter($_[0]);
-  local($m) = tc_filter($_[1]);
-  local($t) = tc_filter($_[2]);
+  local($text) = tc_filter($_[0]);
+  local($details) = tc_filter($_[1]);
+  local($status) = tc_filter($_[2]);
   # The status attribute may take following values:
   # NORMAL, WARNING, FAILURE, ERROR.
@@ -241 +231 @@
   
   ##teamcity[message text='<message text>' errorDetails='<error details>' status='<status value>']
-  putTCmsg( "message", "text=\'$n\' errorDetails=\'$m\' status=\'$t\'"); 
+  putTCmsg( "message", "text=\'$text\' errorDetails=\'$details\' status=\'$status\'");
+}
+
+sub tcFailure
+{
+  local($text) = tc_filter($_[0]);
+  local($details) = tc_filter($_[1]);
+  tcError( $text, $details, "FAILURE" );
+}
+
+sub tcLog
+{ 
+  local($text) = $_[0];
+  putTCmsgNV2( "message", "text", $text, "status", "NORMAL"); 
+}
+sub tcWarn
+{ 
+  local($text) = $_[0];
+  putTCmsgNV2( "message", "text", $text, "status", "WARNING"); 
 }
 
@@ -254 +262 @@
   putTCmsgNV( "testSuiteFinished", "name", $v);
 }
+
+$failed = 0;
+
 sub testStarted
 {
   local($v) = $_[0];        
   putTCmsgNV2( "testStarted", "name", $v, "captureStandardOutput", "true");
+  $failed = 0;    
 }
 sub testFinished
@@ -263 +275 @@
   local($v) = $_[0];
   local($d) = $_[1];
-  putTCmsgNV2( "testFinished", "name", $v, "duration", $d); 
-}
+  putTCmsgNV2( "testFinished", "name", $v, "duration", $d);
+  $failed = 0;   
+}
+
 sub testFailed
 {
   local($n) = $_[0];
   local($m) = $_[1];
-  putTCmsgNV2( "testFailed", "name", $n, "message", $m);
+    
+  if( !$failed )
+  {
+    putTCmsgNV2( "testFailed", "name", $n, "message", $m);
+    $failed = 1;
+  } else
+  {
+    tcFailure("Test: $n => $m", "");
+  }
 }
 sub testFailed2
@@ -276 +298 @@
   local($m) = tc_filter($_[1]);
   local($t) = tc_filter($_[2]);
-  putTCmsg( "testFailed", "name=\'$n\' message=\'$m\' details=\'$t\'"); 
+  if( !$failed )
+  {
+    putTCmsg( "testFailed", "name=\'$n\' message=\'$m\' details=\'$t\'"); 
+    $failed = 1;
+  } else
+  {
+    tcFailure("Test: $n => $m", $t);
+  }
+
 }
 sub testFailedCMP
 {
-  local($n) = tc_filter($_[0]);
-  local($m) = tc_filter($_[1]);
-  local($d) = tc_filter($_[2]);
-  local($e) = tc_filter($_[3]);
-  local($a) = tc_filter($_[4]);
-  putTCmsg( "testFailed", "type=\'comparisonFailure\' name=\'$n\' message=\'$m\' details=\'$d\' expected=\'$e\' actual=\'$a\'"); 
-}
-
-##teamcity[testFailed type='comparisonFailure' name='test2' message='failure message' details='message and stack trace' expected='expected value' actual='actual value']
+  local($name) = tc_filter($_[0]);
+  local($msg) = tc_filter($_[1]);
+  local($details) = tc_filter($_[2]);
+  local($expected) = tc_filter($_[3]);
+  local($actual) = tc_filter($_[4]);
+  if( !$failed )
+  {
+    putTCmsg( "testFailed", "type=\'comparisonFailure\' name=\'$name\' message=\'$msg\' details=\'$details\' expected=\'$expected\' actual=\'$actual\'");
+    $failed = 1;
+  } else
+  {
+    tcFailure("Test: $name => $msg", "$detail\nExpected: $expected\nActual: $actual");
+  }
+
+}
+
+##teamcity[testFailed type='comparisonFailure' name='test_file' message='failure_message' details='message and stack trace' expected='expected value' actual='actual value']
 sub testIgnored
 { 
@@ -375 +413 @@
   $exit_status = mysystem("$diff -w -b \"$root.res.cleaned\" \"$root.new.res.cleaned\" > \"$root.diff\" 2>&1");
 
+  
   # clean up time
   mysystem("$rm -f \"$root.res.cleaned\" \"$root.new.res.cleaned\"");
@@ -385 +424 @@
   $exit_status = $exit_status || (-e "$root.diff" && -s "$root.diff");
 
+  if( $exit_status && (length($teamcity) > 0) )
+  {
+    local($details) = mysystem_catch("$cat \"$root.diff\"");
+    local($expected) = mysystem_catch("$cat \"$root.res\"");
+    local($actual) = mysystem_catch("$cat \"$root.new.res\"");
+    testFailedCMP($test_file, "Differences in res files", $details, $expected, $actual )
+  }
+    
   return($exit_status);
 }
@@ -629 +676 @@
   $cuser_t = $cuser_t2 - $cuser_t;
   $csystem_t = $csystem_t2 - $csystem_t;
-  
+
+  tcLog("Test: $test_file, user time: $cuser_t, system time: $csystem_t" );
+    
   if ($exit_status != 0)
   {
-    $error_cause = "Singular call exited with status != 0";    
+    $error_cause = "Singular call exited with status ($exit_status) != 0";
+    
+    if( length($teamcity) > 0 )
+    {   
+      ### TODO: add a way to detect timeout!!!
+      if( $exit_status == 142 ) # perl sig alarm exit code? NOPE :(((
+      { 
+        local($details) = mysystem_catch("$cat \"$resfile\"");      
+        testFailed2($test_file, "Exit on timeout ($timeout sec)!", $details);    
+      }
+    }
   }
   else
@@ -642 +701 @@
     {
       $error_cause = "Segment fault";
+      local($details) = mysystem_catch("$cat \"$resfile\"");
+      testFailed2($test_file, $error_cause, $details);      
     }
     elsif (! defined($mtrack) && !defined($timings_only))
@@ -701 +762 @@
     }
     print STDERR "!!! $root : $error_cause\n";
-    testFailed($test_file, $error_cause);
+
+    if( length($teamcity) > 0 )
+    {
+      local($details) = mysystem_catch("$cat \"$resfile\"");      
+      testFailed2($test_file, $error_cause, $details);    
+    }
   }
   else
@@ -751 +817 @@
 
   mysystem("mv gmon.out \"gmon.$root.out\"") if (-e "gmon.out");
-
+ 
   testFinished($test_file, $cuser_t + $csystem_t);
   
@@ -969 +1035 @@
 if ($timeout > 0)
 {
-  $singular = "PERL_SIGNALS=unsafe perl -e 'alarm($timeout); exec(\@ARGV); ' $singular";
+  $singular = "PERL_SIGNALS=unsafe perl -e 'alarm($timeout);exec(\@ARGV);' $singular";
   tcLog ("Set exec timeout to $timeout sec.\n");
   # die;