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

[Sandro Santilli]

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

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

Log message:
                * 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 ...

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1320
retrieving revision 1.1321
diff -u -b -r1.1320 -r1.1321
--- ChangeLog   20 Oct 2006 10:26:46 -0000      1.1320
+++ ChangeLog   20 Oct 2006 12:47:13 -0000      1.1321
@@ -1,5 +1,10 @@
 2006-10-20 Sandro Santilli <address@hidden>
 
+       * 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 ...
        * 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/actionscript.all/swf_exists.exp   15 Oct 2006 02:30:55 -0000      
1.11
+++ testsuite/actionscript.all/swf_exists.exp   20 Oct 2006 12:47:13 -0000      
1.12
@@ -13,11 +13,16 @@
 set file all
 set timetol 0
 set executable "../../utilities/gprocessor"
-set params "-v "
+set params "-w"
 
 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} ]"
-    foreach swfversion [list 5 6 7] {
+    foreach swfversion [list 5 6 7 ] {
 
        # some tests might do different things when built for different
        # SWF target versions.
@@ -39,40 +44,44 @@
        }
        
        set testid "SWF${swfversion} [ file tail ${file} ]"
+       verbose "Flash version ${swfversion}"
        
        # spawn the executable and look for the DejaGnu output messages from the
        # test case.
-       verbose "Flash version ${swfversion}"
-       set outp [local_exec "./${executable} ${params} out.swf" "" "" $timeout]
-#      print $outp
+
+       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.
        regsub -all -- "\r" $outp "" outp
 
-       if {[regexp " XFAILED: .*\n" $outp state]} {
-           regsub -all " XFAILED: *\n" $outp "\\1" outp
-           regsub -all -- "\n" $state "" state
+       #print "After regsub: $outp"
+
+       set lines [split $outp \n]
+
+       foreach line $lines {
+
+               #print "Parsing line: $line"
+
+               if {[regexp " XFAILED: .*" $line state]} {
            xfail "$state"
        }
        
-       if {[regexp " FAILED: .*\n" $outp state]} {
-           regsub -all  "FAILED: *\n" $outp "\\1" outp
-           regsub -all -- "\n" $state "" state
+               if {[regexp " FAILED: .*" $line state]} {
            fail "$state"
        }
-       if {[regexp " XPASSED: .*\n" $outp state]} {
-           regsub -all "XPASSED: *\n" $outp "\\1" outp
-           regsub -all -- "\n" $state "" state
+
+               if {[regexp " XPASSED: .*" $line state]} {
            xpass "$state"
        }
-       if {[regexp " PASSED: .*\n" $outp state]} {
-           regsub -all "PASSED: *\n" $outp "\\1" outp
-           regsub -all -- "\n" $state "" state
+
+               if {[regexp " PASSED: .*" $line state]} {
            pass "$state"
        }
 
     }
+
+    }
 }