diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-05-26 09:27:05 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-05-26 09:27:05 -0400 |
| commit | 82932a67491cf0ecbcc964448926052dc4b54b4b (patch) | |
| tree | b20b4fc0b768f3b8cf6914f06cab704917abdf39 | |
| parent | ea5bf166039d50d5b687c7e622e137732f2b2d4d (diff) | |
| download | systemtap-steved-82932a67491cf0ecbcc964448926052dc4b54b4b.tar.gz systemtap-steved-82932a67491cf0ecbcc964448926052dc4b54b4b.tar.xz systemtap-steved-82932a67491cf0ecbcc964448926052dc4b54b4b.zip | |
stmtvars.exp regexp tweak
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.base/stmtvars.exp | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index e15f5b3d..f1e4d603 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-05-26 Frank Ch. Eigler <fche@elastic.org> + + * testsuite/stmtvars.exp: Tweaked matching regexps, tested on + f7, rhel5. + 2008-05-24 Frank Ch. Eigler <fche@elastic.org> * configure.ac (enable-dejazilla): Add option, default off. diff --git a/testsuite/systemtap.base/stmtvars.exp b/testsuite/systemtap.base/stmtvars.exp index ee0dcf20..822e0d7e 100644 --- a/testsuite/systemtap.base/stmtvars.exp +++ b/testsuite/systemtap.base/stmtvars.exp @@ -5,9 +5,8 @@ set pc 0 set vars "" spawn stap -e "probe kernel.function(\"sys_open\") {\$foo}" -p4 -vv -u expect { - -re {probe sys_open.*pc=(0x.*)\r\nsemantic} { set pc $expect_out(1,string); exp_continue } - -re {alternatives: ([^\r\n]*) identifier [^\r\n]*\r\n} { set vars $expect_out(1,string) - exp_continue } + -re {probe sys_open[^\r\n]*pc=(0x[^\r\n]*)\r\n} { set pc $expect_out(1,string); exp_continue } + -re {alternatives: ([^\r\n]*)\): identifier [^\r\n]*\r\n} { set vars $expect_out(1,string); exp_continue } timeout { fail "$test (timeout)" } eof } @@ -19,9 +18,8 @@ set pc2 0 set vars2 "" spawn stap -e "probe kernel.statement($pc) {\$foo}" -p4 -vv -u expect { - -re {probe sys_open.*pc=(0x.*)\r\nsemantic} { set pc2 $expect_out(1,string); exp_continue } - -re {alternatives: ([^\r\n]*) identifier [^\r\n]*\r\n} { set vars2 $expect_out(1,string) - exp_continue } + -re {probe sys_open[^\r\n]*pc=(0x[^\r\n]*)\r\n} { set pc2 $expect_out(1,string); exp_continue } + -re {alternatives: ([^\r\n]*)\): identifier [^\r\n]*\r\n} { set vars2 $expect_out(1,string); exp_continue } timeout { fail "$test (timeout)" } eof } |