make uprobes -p5 test message matching more liberal

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 2652aad437bdc5cda265dc0e64e085fb770c775f..c1ae142076b0e480b39bd0d7c697005dc024d215 100644 (file)
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-29  Frank Ch. Eigler  <fche@elastic.org>
+
+       * systemtap.base/uprobes.exp: Simplify -p5 test.
+
 2008-11-29  Frank Ch. Eigler  <fche@elastic.org>
 
        * systemtap.base/static_uprobes.exp: Simplified pass/fail messages.

diff --git a/testsuite/systemtap.base/uprobes.exp b/testsuite/systemtap.base/uprobes.exp
index c1b9968c075ffc55305702ead5b7da6db2d38e96..408ba8c44bcbcf686c3c0ae2447e049aac53c837 100644 (file)
--- a/testsuite/systemtap.base/uprobes.exp
+++ b/testsuite/systemtap.base/uprobes.exp
@@ -25,16 +25,11 @@ if {! [installtest_p]} { untested "$test -p5"; exec rm -f jennie.c jennie; retur
 
 # Pick up the stap being tested.
 set stapexe [exec /usr/bin/which stap]
-spawn sudo $stapexe -v $srcdir/$subdir/uprobes.stp -c "./jennie 1 2 3 4"
+spawn sudo $stapexe $srcdir/$subdir/uprobes.stp -w -c "./jennie 1 2 3 4"
 set ok 0
 expect {
-    -re {^Pass[^\r\n]*\r\n} { exp_continue }
-    -re {^Warning[^\r\n]*\r\n} { exp_continue }
-    -re {^Disabling[^\r\n]*\r\n} { exp_continue }
-    -re {^Uprobes[^\r\n]*\r\n} { exp_continue }
-    -re {^Cache[^\r\n]*\r\n} { exp_continue }
-    -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*call argc=0x[1-5][^\r\n]*\r\n} { incr ok; exp_continue }
-    -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*return return=0x0[^\r\n]*\r\n} { incr ok; exp_continue }
+    -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*argc=0x[1-5][^\r\n]*\r\n} { incr ok; exp_continue }
+    -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*return=0x0[^\r\n]*\r\n} { incr ok; exp_continue }
     -timeout 30
     timeout { }
     eof { }