diff options
author | Ben Elliston <bje@gnu.org> | 2008-04-07 14:48:21 +1000 |
---|---|---|
committer | Ben Elliston <bje@gnu.org> | 2008-04-07 14:49:27 +1000 |
commit | 7cd597d12ffd161206a468963fb791ffa833086e (patch) | |
tree | 0848199f286311055864ea8b82634e34a6ad7b78 /lib/dejagnu.exp | |
parent | 7366d4887cca6839218272fc298cd1a1fb708b39 (diff) | |
download | dejagnu-7cd597d12ffd161206a468963fb791ffa833086e.zip dejagnu-7cd597d12ffd161206a468963fb791ffa833086e.tar.gz dejagnu-7cd597d12ffd161206a468963fb791ffa833086e.tar.bz2 |
Make the testsuite work better.origin/masterorigin/HEAD
* Makefile.am (RUNTESTDEFAULTFLAGS): Add RUNTEST=$(RUNTEST).
* Makefile.in: Regenerate.
* dejagnu.exp (host_execute): Improve regexp matching.
* testsuite/libdejagnu/unit.cc: C++ fixes.
Diffstat (limited to 'lib/dejagnu.exp')
-rwxr-xr-x | lib/dejagnu.exp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/dejagnu.exp b/lib/dejagnu.exp index a293f2f..a764aa5 100755 --- a/lib/dejagnu.exp +++ b/lib/dejagnu.exp @@ -133,49 +133,50 @@ proc host_execute {args} { # test case. # spawn -noecho -open [open "|./${executable}" "r"] spawn -noecho "./${executable}" ${params} + set prefix "\[^\r\n\]*" expect { - -re "\[0-9\]\[0-9\]:..:..:${text}\r\n" { + -re "^$prefix\[0-9\]\[0-9\]:..:..:${text}*\r\n" { regsub "\[\n\r\t\]*NOTE: $text\r\n" $expect_out(0,string) "" output verbose "$output" 3 set timetol 0 exp_continue } - -re "NOTE:${text}*" { + -re "^$prefix\tNOTE:${text}*" { regsub "\[\n\r\t\]*NOTE: $text\r\n" $expect_out(0,string) "" output set output [string range $output 6 end] verbose "$output" 2 set timetol 0 exp_continue } - -re "PASSED:${text}*" { + -re "^$prefix\tPASSED:${text}*" { regsub "\[\n\r\t\]*PASSED: $text\r\n" $expect_out(0,string) "" output set output [string range $output 8 end] pass "$output" set timetol 0 exp_continue } - -re "FAILED:${text}*" { + -re "^$prefix\tFAILED:${text}*" { regsub "\[\n\r\t\]*FAILED: $text\r\n" $expect_out(0,string) "" output set output [string range $output 8 end] fail "$output" set timetol 0 exp_continue } - -re "UNTESTED:${text}*" { + -re "^$prefix\tUNTESTED:${text}*" { regsub "\[\n\r\t\]*TESTED: $text\r\n" $expect_out(0,string) "" output set output [string range $output 8 end] untested "$output" set timetol 0 exp_continue } - -re "UNRESOLVED:${text}*" { + -re "^$prefix\tUNRESOLVED:${text}*" { regsub "\[\n\r\t\]*UNRESOLVED: $text\r\n" $expect_out(0,string) "" output set output [string range $output 8 end] unresolved "$output" set timetol 0 exp_continue } - -re "Totals" { + -re "^Totals" { verbose "All done" 2 } eof { @@ -193,6 +194,9 @@ proc host_execute {args} { return "Timed out executing test case" } } + -re "^$prefix\r\n" { + exp_continue + } } # force a close of the executable to be safe. |