From 2b9c700be957b81e1c51e7199e5db77614bc025b Mon Sep 17 00:00:00 2001
From: Wenji Huang <wenji.huang@oracle.com>
Date: Mon, 4 May 2009 16:51:41 -0400
Subject: Tweak alternatives.exp

---
 testsuite/systemtap.base/alternatives.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'testsuite/systemtap.base')

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)" }
-- 
cgit 


From c4b2ebcba96721ff5bf78224825bf1b9002ca145 Mon Sep 17 00:00:00 2001
From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Date: Tue, 5 May 2009 10:31:07 +0530
Subject: Revert "Fix kprobes.exp."

This reverts commit 97d1fa6e24d8d4e8ceefc62f0d4a7f93a18e4125.
---
 testsuite/systemtap.base/kprobes.exp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'testsuite/systemtap.base')

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"
-- 
cgit