[111298] branches/gsoc13-tests/tests/test.tcl

[cal at macports.org]

Revision: 111298
          https://trac.macports.org/changeset/111298
Author:   cal at macports.org
Date:     2013-09-18 11:39:44 -0700 (Wed, 18 Sep 2013)
Log Message:
-----------
regression tests: fix test output parsing using changes from src/macports1.0/tests/test.tcl

Modified Paths:
--------------
    branches/gsoc13-tests/tests/test.tcl

Modified: branches/gsoc13-tests/tests/test.tcl
===================================================================
--- branches/gsoc13-tests/tests/test.tcl	2013-09-18 18:34:11 UTC (rev 111297)
+++ branches/gsoc13-tests/tests/test.tcl	2013-09-18 18:39:44 UTC (rev 111298)
@@ -100,17 +100,20 @@
     
         set result [eval exec $tcl test.tcl $arguments]
         set lastline [lindex [split $result "\n"] end]
+
+        if {[lrange [split $lastline "\t"] 1 1] != "Total"} {
+            set lastline [lindex [split $result "\n"] end-2]
+            set errmsg [lindex [split $result "\n"] end]
+        }
+
         set splitresult [split $lastline "\t"]
-        set total  [lindex $splitresult 2]
-        set pass   [lindex $splitresult 4]
-        set skip   [lindex $splitresult 6]
-        set fail   [lindex $splitresult 8]
-        set errmsg [lindex $splitresult 2]
+        set total [lindex $splitresult 2]
+        set pass [lindex $splitresult 4]
+        set skip [lindex $splitresult 6]
+        set fail [lindex $splitresult 8]
 
         # Check for errors.
-        if { $fail != 0 || $skip != 0 } {
-            set err "yes"
-        }
+        if { $fail != 0 } { set err "yes" }
 
         set out ""
         if { ($fail != 0 || $skip != 0) && $color_out == "" } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130918/68589f66/attachment.html>