summaryrefslogtreecommitdiffstats
path: root/testsuite/systemtap.base
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-05-25 12:02:27 -0400
committerDave Brolley <brolley@redhat.com>2009-05-25 12:02:27 -0400
commit422be92440f596bea6b933965072916c480ea22b (patch)
treed25d3fadbc9e97b0362e973ffb49a1ec9357bf13 /testsuite/systemtap.base
parent5131240c3f9c9c3a2c714ac873fdcdd11f10f617 (diff)
parentc9116e9980ad6e417697737f8d54a4a625811245 (diff)
downloadsystemtap-steved-422be92440f596bea6b933965072916c480ea22b.tar.gz
systemtap-steved-422be92440f596bea6b933965072916c480ea22b.tar.xz
systemtap-steved-422be92440f596bea6b933965072916c480ea22b.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'testsuite/systemtap.base')
-rw-r--r--testsuite/systemtap.base/badkprobe.exp15
1 files changed, 14 insertions, 1 deletions
diff --git a/testsuite/systemtap.base/badkprobe.exp b/testsuite/systemtap.base/badkprobe.exp
index c0815fbe..96ad5a3b 100644
--- a/testsuite/systemtap.base/badkprobe.exp
+++ b/testsuite/systemtap.base/badkprobe.exp
@@ -19,7 +19,20 @@ foreach bk $bad_kprobes {
spawn stap -g -w -e "$script" "$bk"
expect {
-timeout 60
- -re "^WARNING: probe .*registration error.*\r\ncleanup ok" { pass $test }
+ -re "^WARNING: probe .*registration error.*\r\ncleanup ok\r\n" { pass $test }
+ eof { fail "$test (eof)" }
+ timeout { fail "$test (timeout)" }
+ }
+ catch {close}
+ catch {wait}
+}
+
+foreach bk $bad_kprobes {
+ set test "bad optional kprobe registration: $bk"
+ spawn stap -g -w -e "$script" "$bk ?"
+ expect {
+ -timeout 60
+ -re "^cleanup ok\r\n" { pass $test }
eof { fail "$test (eof)" }
timeout { fail "$test (timeout)" }
}