summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-05-05 11:56:37 -0400
committerDave Brolley <brolley@redhat.com>2009-05-05 11:56:37 -0400
commit5b8db791abb8c968b55fcf80380b8b7d8d77f53a (patch)
tree921759769ad6b5b91d43df5f7dcc0be1772bc188 /testsuite
parentfac37258fd3c7710407203b206963c7bff57075d (diff)
parent6820dda776595280e6dc535df32648b47d21e329 (diff)
downloadsystemtap-steved-5b8db791abb8c968b55fcf80380b8b7d8d77f53a.tar.gz
systemtap-steved-5b8db791abb8c968b55fcf80380b8b7d8d77f53a.tar.xz
systemtap-steved-5b8db791abb8c968b55fcf80380b8b7d8d77f53a.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/systemtap.base/alternatives.exp4
-rw-r--r--testsuite/systemtap.base/kprobes.exp7
2 files changed, 3 insertions, 8 deletions
diff --git a/testsuite/systemtap.base/alternatives.exp b/testsuite/systemtap.base/alternatives.exp
index ca78479b..6cbc1e10 100644
--- a/testsuite/systemtap.base/alternatives.exp
+++ b/testsuite/systemtap.base/alternatives.exp
@@ -37,9 +37,9 @@ proc stap_run_alternatives {args} {
}
set test "LOCAL1"
-set rc [stap_run_alternatives stap -vu -p2 -e $local1_script]
+set rc [stap_run_alternatives stap -u -p2 -e $local1_script]
if {$rc >= 1} { pass $test } else { fail "$test ($rc)" }
set test "STRUCT1"
-set rc [stap_run_alternatives stap -vu -p2 -e $struct1_script]
+set rc [stap_run_alternatives stap -u -p2 -e $struct1_script]
if {$rc >= 1} { pass $test } else { fail "$test ($rc)" }
diff --git a/testsuite/systemtap.base/kprobes.exp b/testsuite/systemtap.base/kprobes.exp
index 9f92f14a..635930f8 100644
--- a/testsuite/systemtap.base/kprobes.exp
+++ b/testsuite/systemtap.base/kprobes.exp
@@ -1,7 +1,2 @@
set test "kprobes"
-spawn stap -vv $srcdir/$subdir/$test.stp
-expect {
- -timeout 120
- "systemtap starting probe" { pass "$test (probe_hit)" }
- timeout { fail "$test (timeout)" }
- }
+stap_run $srcdir/$subdir/$test.stp no_load "probe point hit"