diff options
| author | hunt <hunt> | 2007-06-25 17:38:33 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2007-06-25 17:38:33 +0000 |
| commit | 23944d00d55ecc08acbb0e2f39f7fb5cd7a0580e (patch) | |
| tree | cb2420141fc0730a897fb5ee188b341ccf51798f | |
| parent | e37e7136a2d67d7b162a45412acbac47bbe5ea69 (diff) | |
| download | systemtap-steved-23944d00d55ecc08acbb0e2f39f7fb5cd7a0580e.tar.gz systemtap-steved-23944d00d55ecc08acbb0e2f39f7fb5cd7a0580e.tar.xz systemtap-steved-23944d00d55ecc08acbb0e2f39f7fb5cd7a0580e.zip | |
2007-06-25 Martin Hunt <hunt@redhat.com>
* systemtap.maps/pmap_agg_overflow.exp: Rewrite
so order of error messages is not important.
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.maps/pmap_agg_overflow.exp | 38 |
2 files changed, 28 insertions, 15 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 1160993b..f70bcc7b 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-06-25 Martin Hunt <hunt@redhat.com> + + * systemtap.maps/pmap_agg_overflow.exp: Rewrite + so order of error messages is not important. + 2007-06-22 Frank Ch. Eigler <fche@elastic.org> * systemtap.syscall/readwrite.c: Tweak for new default string truncation width. diff --git a/testsuite/systemtap.maps/pmap_agg_overflow.exp b/testsuite/systemtap.maps/pmap_agg_overflow.exp index a3d22dc2..9d7a48ad 100644 --- a/testsuite/systemtap.maps/pmap_agg_overflow.exp +++ b/testsuite/systemtap.maps/pmap_agg_overflow.exp @@ -3,26 +3,34 @@ set test "pmap_agg_overflow" if {![installtest_p]} { untested $test; return } -set pass_result "^(ERROR: \[^\r\]*overflow\[^\r\]*\r\n){2}WARNING: Number of errors: 2, skipped probes: 0\r\n$" +set pass1 "^ERROR: \[^\r\]*overflow\[^\r\]*\r\n" +set pass2 "WARNING: Number of errors: 2, skipped probes: 0\r\n" set skip_result "^WARNING: This test only applies to smp systems\.\.\.\r\n" -# spawn test +set pass 0 + spawn stap -DMAXERRORS=1 -g $srcdir/$subdir/$test.stp expect { -timeout 240 - -re $pass_result { - pass "$test passed" - } - -re $skip_result { - unsupported "$test requires smp" - } - timeout { - send "\003" - fail "$test timed out" - } - eof { - fail "$test unexpected EOF" } - -re "semantic error:" { fail "$test compilation" } + -re $pass1 {incr pass; exp_continue} + -re $pass2 {incr pass; exp_continue} + -re $skip_result { + unsupported "$test requires smp" + } + timeout { + send "\003" + fail "$test timed out" + } + eof {} + -re "semantic error:" { fail "$test compilation" } } catch { close } wait + +if {$pass == 3} { + pass $test +} else { + fail "$test ($pass)" +} + + |