diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-09-26 15:23:10 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-09-26 15:23:10 -0400 |
| commit | b487a14d6d160f38dd1dbabe305b373b37972074 (patch) | |
| tree | 78875ffa9728682b00f0f35f50e36199c66b644c /testsuite | |
| parent | 80b4ad8b10c4a27d50bc420e44e77961c9638daf (diff) | |
| download | systemtap-steved-b487a14d6d160f38dd1dbabe305b373b37972074.tar.gz systemtap-steved-b487a14d6d160f38dd1dbabe305b373b37972074.tar.xz systemtap-steved-b487a14d6d160f38dd1dbabe305b373b37972074.zip | |
PR6916: fix STRUCT1 ($var alternatives error message syntax) regression
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.base/alternatives.exp | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 234ff66d..f3fad077 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-09-26 Frank Ch. Eigler <fche@elastic.org> + + PR 6916. + * systemtap.base/alternatives.exp: Assert error counts. + 2008-09-15 Mark Wielaard <mjw@redhat.com> * buildok/seventeen.stp: Fix 2.6.27 detection. diff --git a/testsuite/systemtap.base/alternatives.exp b/testsuite/systemtap.base/alternatives.exp index 673f3426..deaf3bf8 100644 --- a/testsuite/systemtap.base/alternatives.exp +++ b/testsuite/systemtap.base/alternatives.exp @@ -26,11 +26,10 @@ proc stap_run_alternatives {args} { verbose -log "starting $args" eval spawn $args expect { - -re {semantic error: .+ \(alternatives: [a-zA-Z_]} - { set alternatives_found 1 } + -re {semantic error: .+ \(alternatives: [a-zA-Z_]} {incr alternatives_found; exp_continue} -re {[^\r]*\r} { verbose -log $expect_out(0,string); exp_continue } eof { } - timeout { exp_continue } + timeout { } } set results [wait] verbose -log "wait results: $results" @@ -39,8 +38,8 @@ proc stap_run_alternatives {args} { set test "LOCAL1" set rc [stap_run_alternatives stap -vu -p2 -e $local1_script] -if {$rc == 1} { pass $test } else { fail $test } +if {$rc == 1} { pass $test } else { fail "$test ($rc)" } set test "STRUCT1" set rc [stap_run_alternatives stap -vu -p2 -e $struct1_script] -if {$rc == 1} { pass $test } else { fail $test } +if {$rc == 1} { pass $test } else { fail "$test ($rc)" } |