[Gnash-commit] gnash ChangeLog testsuite/simple.exp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/07 16:57:15

Modified files:
        .              : ChangeLog 
        testsuite      : simple.exp 

Log message:
                * testsuite/simple.exp: hopefully made properly
                  deal with buffering. Any test is welcome.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2566&r2=1.2567
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/simple.exp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2566
retrieving revision 1.2567
diff -u -b -r1.2566 -r1.2567
--- ChangeLog   7 Mar 2007 15:11:23 -0000       1.2566
+++ ChangeLog   7 Mar 2007 16:57:15 -0000       1.2567
@@ -1,5 +1,10 @@
 2007-03-07 Sandro Santilli <address@hidden>
 
+       * testsuite/simple.exp: hopefully made properly
+         deal with buffering. Any test is welcome.
+
+2007-03-07 Sandro Santilli <address@hidden>
+
        * Makefile.am, configure.ac, testsuite/Makefile.am,
          testsuite/misc-ming.all/Makefile.am, testsuite/swfdec/.cvsignore,
          testsuite/swfdec/Makefile.am, testsuite/swfdec/PASSING,

Index: testsuite/simple.exp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/simple.exp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/simple.exp        20 Feb 2007 11:14:45 -0000      1.10
+++ testsuite/simple.exp        7 Mar 2007 16:57:15 -0000       1.11
@@ -29,50 +29,51 @@
     spawn -noecho ./$file 
 
     expect {
-       -re "NOTE:\[^\n\r\]*\[\n\r\]" {
-           regsub "\[\n\r\t\]*NOTE: " $expect_out(0,string) "" output
+       -re "^\[^\n]*NOTE:\[^\n]*\n" {
+           regsub ".*NOTE: " $expect_out(0,string) "" output
            set output [string range $output 0 end-2]
            verbose "${file} $output" 
            exp_continue -continue_timer
        }
-       -re "XPASSED:\[^\n\r\]*\[\n\r\]" {
-           regsub "\[\n\r\t\]*XPASSED: " $expect_out(0,string) "" output
+       -re "^\[^\n]*XPASSED:\[^\n]*\n" {
+           regsub ".*XPASSED: " $expect_out(0,string) "" output
            set output [string range $output 0 end-2]
            xpass "${file}: $output"
            exp_continue -continue_timer
        }
-       -re "PASSED:\[^\n\r\]*\[\n\r\]" {
-           regsub "\[\n\r\t\]*PASSED: " $expect_out(0,string) "" output
+       -re "^\[^\n]*PASSED:\[^\n]*\n" {
+           regsub ".*PASSED: " $expect_out(0,string) "" output
            set output [string range $output 0 end-2]
            pass "${file}: $output"
            exp_continue -continue_timer
        }
-       -re "XFAILED:\[^\n\r]*\[\n\r\]" {
-           regsub "\[\n\r\t\]*XFAILED: " $expect_out(0,string) "" output
+       -re "^\[^\n]*XFAILED:\[^\n]*\n" {
+           regsub ".*XFAILED: " $expect_out(0,string) "" output
            set output [string range $output 0 end-2] 
            xfail "${file}: $output"
            exp_continue -continue_timer
        }
-       -re "FAILED:\[^\n\r\]*\[\n\r\]" {
-           regsub "\[\n\r\t\]*FAILED: " $expect_out(0,string) "" output
+       -re "^\[^\n]*FAILED:\[^\n]*\n" {
+           regsub ".*FAILED: " $expect_out(0,string) "" output
            set output [string range $output 0 end-2] 
            fail "${file}: $output"
            exp_continue -continue_timer
        }
-       -re "UNTESTED:\[^\n\r\]*\[\n\r\]" {
-           regsub "\[\n\r\t\]*TESTED: " $expect_out(0,string) "" output
-           set output [string range $output 8 end-2]
+       -re "^\[^\n]*UNTESTED:\[^\n]*\n" {
+           regsub ".*UNTESTED: " $expect_out(0,string) "" output
+           set output [string range $output 0 end-2]
            untested "${file}: $output"
            exp_continue -continue_timer
        }
-       -re "UNRESOLVED:\[^\n\r\]*\[\n\r\]" {
-           regsub "\[\n\r\t\]*UNRESOLVED: " $expect_out(0,string) "" output
-           set output [string range $output 8 end-2]
+       -re "^\[^\n]*UNRESOLVED:\[^\n]*\n" {
+           regsub ".*UNRESOLVED: " $expect_out(0,string) "" output
+           set output [string range $output 0 end-2]
            unresolved "${file}: $output"
            exp_continue -continue_timer
        }
-       -re "Totals" {
-           verbose "All done" 2
+       -re "^\[^\n]*\n" {
+            # just remove non-matching lines!
+            exp_continue -continue_timer
        }
        eof {
            #       unresolved "${file} died prematurely"