[Gnash-commit] gnash ChangeLog testsuite/actionscript.all/swf_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/20 13:03:49

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: swf_exists.exp 

Log message:
        Catch errors in gprocessor run, reintroduce test labels.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1321&r2=1.1322
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/swf_exists.exp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1321
retrieving revision 1.1322
diff -u -b -r1.1321 -r1.1322
--- ChangeLog   20 Oct 2006 12:47:13 -0000      1.1321
+++ ChangeLog   20 Oct 2006 13:03:49 -0000      1.1322
@@ -2,9 +2,7 @@
 
        * testsuite/actionscript.all/swf_exists.exp: made it work
          again with tcl versions in debian stable :D
-         Note that one of the tests (LocalConnection) aborts the gprocessor
-         utility, thus is currently skipped by the tester, to be unskipped
-         when gprocessor stops aborting ...
+         Also, reintroduced test id labels in pass/fail messages.
        * libbase/log.{cpp,h}: LogFile operator << for 'std::endl' (?) fixed
          to return LogFile (not std::ostream).
        * testsuite/actionscript.all/Makefile.am: added 'check.as' and

Index: testsuite/actionscript.all/swf_exists.exp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/swf_exists.exp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/actionscript.all/swf_exists.exp   20 Oct 2006 12:47:13 -0000      
1.12
+++ testsuite/actionscript.all/swf_exists.exp   20 Oct 2006 13:03:49 -0000      
1.13
@@ -17,15 +17,13 @@
 
 foreach file [glob ${srcdir}/*.as] {
 
-       # TODO: FIME: Remove me when LocalConnection doesn't choke 
-       #       gprocessor anymore
-       if { $file == "${srcdir}/LocalConnection.as" } continue
-
-    puts "Executing test case [ file tail ${file} ]"
+    puts "Running test case [ file tail ${file} ]"
     foreach swfversion [list 5 6 7 ] {
 
        # some tests might do different things when built for different
        # SWF target versions.
+
+       # FIXME: check for failures
        exec makeswf -I${srcdir} -DOUTPUT_VERSION=${swfversion} -v${swfversion} 
${file}
        
        # ready for Ming-0.4 naming of .pp file
@@ -49,7 +47,15 @@
        # spawn the executable and look for the DejaGnu output messages from the
        # test case.
 
-       set outp [exec -keepnewline -- ./${executable} -v out.swf]
+       if {[catch {exec -keepnewline -- ./${executable} -v out.swf} out] } {
+               fail "$testid: gprocessor exited with non-zero code"
+               #verbose "($out)"
+               continue
+       } else {
+               set outp $out
+       }
+
+       #set outp [exec -keepnewline -- ./${executable} -v out.swf]
 
        # remove the \r part of "\r\n" so we don't break all the patterns
        # we want to match.
@@ -64,19 +70,19 @@
                #print "Parsing line: $line"
 
                if {[regexp " XFAILED: .*" $line state]} {
-                   xfail "$state"
+                   xfail "$testid: $state"
                }
 
                if {[regexp " FAILED: .*" $line state]} {
-                   fail "$state"
+                   fail "$testid: $state"
                }
 
                if {[regexp " XPASSED: .*" $line state]} {
-                   xpass "$state"
+                   xpass "$testid: $state"
                }
 
                if {[regexp " PASSED: .*" $line state]} {
-                   pass "$state"
+                   pass "$testid: $state"
                }
                
        }