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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/29 15:40:59

Modified files:
        .              : ChangeLog 
        testsuite      : simple.exp 

Log message:
        * testsuite/simple.exp: handle deadlocks or infinite loops in testcases.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1818&r2=1.1819
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/simple.exp?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1818
retrieving revision 1.1819
diff -u -b -r1.1818 -r1.1819
--- ChangeLog   29 Nov 2006 12:38:41 -0000      1.1818
+++ ChangeLog   29 Nov 2006 15:40:59 -0000      1.1819
@@ -1,5 +1,7 @@
 2006-11-29 Sandro Santilli <address@hidden>
 
+       * testsuite/simple.exp: handle deadlocks or infinite loops 
+         in testcases.
        * testsuite/simple.exp: handle premature death and non-zero
          return of testcases.
        * testsuite/misc-ming.all/DefineEditTextVariableNameTest.c:

Index: testsuite/simple.exp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/simple.exp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/simple.exp        29 Nov 2006 12:38:42 -0000      1.7
+++ testsuite/simple.exp        29 Nov 2006 15:40:59 -0000      1.8
@@ -8,10 +8,12 @@
     strace $tracelevel
 }
 
-set timeoutmsg "Timed out: Never got started, "
+# After these many seconds of execution the test script is aborted with a 
failure.
+# This is to handle deadlocks. We don't reset the timeout when a match is
+# found to avoid hanging in case of a testcase sending matches in an infinite 
loops.
+# (not unlikely as it seems, think about flash movies...)
 set timeout 100
 set file all
-set timetol 0
 set params ""
 
 # testcases is set by the Makefile in the site.exp data file.
@@ -31,50 +33,43 @@
            regsub "\[\n\t\]*NOTE: " $expect_out(0,string) "" output
            set output [string range $output 0 end-2]
            verbose "${file} $output" 
-           set timetol 0
-           exp_continue
+           exp_continue -continue_timer
        }
        -re "XPASSED:\[^\n]*\n" {
            regsub "\[\n\t\]*XPASSED: " $expect_out(0,string) "" output
            set output [string range $output 0 end-2]
            xpass "${file}: $output"
-           set timetol 0
-           exp_continue
+           exp_continue -continue_timer
        }
        -re "PASSED:\[^\n]*\n" {
            regsub "\[\n\t\]*PASSED: " $expect_out(0,string) "" output
            set output [string range $output 0 end-2]
            pass "${file}: $output"
-           set timetol 0
-           exp_continue
+           exp_continue -continue_timer
        }
        -re "XFAILED:\[^\n\]*\n" {
            regsub "\[\n\t\]*XFAILED: " $expect_out(0,string) "" output
            set output [string range $output 0 end-2] 
            xfail "${file}: $output"
-           set timetol 0
-           exp_continue
+           exp_continue -continue_timer
        }
        -re "FAILED:\[^\n\]*\n" {
            regsub "\[\n\t\]*FAILED: " $expect_out(0,string) "" output
            set output [string range $output 0 end-2] 
            fail "${file}: $output"
-           set timetol 0
-           exp_continue
+           exp_continue -continue_timer
        }
        -re "UNTESTED:\[^\n]*\n" {
            regsub "\[\n\t\]*TESTED: " $expect_out(0,string) "" output
            set output [string range $output 8 end-2]
            untested "${file}: $output"
-           set timetol 0
-           exp_continue
+           exp_continue -continue_timer
        }
        -re "UNRESOLVED:\[^\n]*\n" {
            regsub "\[\n\t\]*UNRESOLVED: " $expect_out(0,string) "" output
            set output [string range $output 8 end-2]
            unresolved "${file}: $output"
-           set timetol 0
-           exp_continue
+           exp_continue -continue_timer
        }
        -re "Totals" {
            verbose "All done" 2
@@ -85,14 +80,9 @@
            #       return "${file} died prematurely"
        }
        timeout {
-           warning "Timed out executing test case"
-           if { $timetol <= 2 } {
-               incr timetol
-               exp_continue
-           } else {
-               -               catch close
-               return "Timed out executing test case"
-           }
+               fail "Test case ${file} still running after ${timeout} seconds, 
killing it (deadlock?)"
+               catch close
+               continue;
        }
    }