diff options
author | wenji <wjhuang@dhcp-beijing-cdc-10-182-120-233.cn.oracle.com> | 2008-04-06 18:10:46 -0400 |
---|---|---|
committer | wenji <wjhuang@dhcp-beijing-cdc-10-182-120-233.cn.oracle.com> | 2008-04-06 18:10:46 -0400 |
commit | 34fc1cc81a47fbb3f712a70a2acdb533e2a99090 (patch) | |
tree | b4ce84e968bae9f6c9c11a02ce59c64f3859b62b /testsuite | |
parent | 8aa6c571b70f61727b92b4442a645a260b53b52a (diff) | |
parent | 946d18f91669c0fbee36124f0bc06d7cf56aecdf (diff) | |
download | systemtap-steved-34fc1cc81a47fbb3f712a70a2acdb533e2a99090.tar.gz systemtap-steved-34fc1cc81a47fbb3f712a70a2acdb533e2a99090.tar.xz systemtap-steved-34fc1cc81a47fbb3f712a70a2acdb533e2a99090.zip |
Merge branch 'master' of ssh://wenji@sources.redhat.com/git/systemtap
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | testsuite/systemtap.stress/conversions.exp | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index da789127..95c1f117 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2008-04-04 Masami Hiramatsu <mhiramat@redhat.com> + + PR 5528 + * systemtap.stress/conversions.exp: Update a script to catch up + recently changes of conversions.stp. + 2008-03-31 Frank Ch. Eigler <fche@elastic.org> * configure.ac: Bump version to 0.7. diff --git a/testsuite/systemtap.stress/conversions.exp b/testsuite/systemtap.stress/conversions.exp index 34cd3889..9c2c2fa9 100644 --- a/testsuite/systemtap.stress/conversions.exp +++ b/testsuite/systemtap.stress/conversions.exp @@ -12,13 +12,12 @@ foreach value {0 0xffffffff 0xffffffffffffffff} { verbose -log "exp $test $errs" expect { -timeout 180 - -re {ERROR[^\r\n]*\r\n} { incr errs; exp_continue } - -re {WARNING[^\r\n]*\r\n} { incr errs; exp_continue } + -re {(ERROR|WARNING)[^\r\n]*\r\n} { incr errs; exp_continue } eof { } timeout { fail "$test (timeout)" } } verbose -log "done exp $test $errs" wait - if {$errs == 9} { pass $test } else { fail "$test ($errs)" } + if {$errs == 14} { pass $test } else { fail "$test ($errs)" } verbose -log "done $test $errs" } |