Changeset 2163

Timestamp:

Mar 28, 2011, 8:35:13 PM (13 years ago)

Author:

mmc

Message:

Fix for the tester to work better with the various language bindings
that return "0" instead of "ok" and "1" instead of "failure". The
tester now treats anything other than 0/ok as failure.

File:

• trunk/tester/scripts/test.tcl (modified) (4 diffs)

trunk/tester/scripts/test.tcl

@@ -50 +50 @@
     public proc queue {op args}
 
+    # useful helper function -- looks for val among choices
+    public proc oneof {choices val} {
+        return [expr {[lsearch -exact $choices $val] >= 0}]
+    }
+
     private common _queue       ;# queue of objects waiting to run
     set _queue(tests) ""        ;# list of tests in the queue
@@ -162 +167 @@
             set _runobj $result
 
-            if {[$_testobj get output.status] ne "ok"} {
+            if {![oneof {0 ok} [$_testobj get output.status]]} {
                 # expected test to fail, but it didn't
                 set idiffs [_computeDiffs [$_toolobj xml object] $_runobj -in input]
@@ -183 +188 @@
         } else {
             set _runobj [_buildFailure $result]
-            if {[$_testobj get output.status] eq "failed"
+            if {![oneof {0 ok} [$_testobj get output.status]]
                   && [$_testobj get output.log] eq $result} {
                 _setResult "Pass"
@@ -196 +201 @@
     } else {
         set _runobj [_buildFailure $result]
-        if {[$_testobj get output.status] eq "failed"
+        if {![oneof {0 ok} [$_testobj get output.status]]
               && [$_testobj get output.log] eq $result} {
             _setResult "Pass"