From d4f3b283f50f2399f55a6603a7a8bb82931a2e04 Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Sat, 15 Mar 2008 17:29:09 +0000
Subject: * systemtap.base/maxactive.exp, probefunc.exp: Standardize pass msg.

---
 testsuite/systemtap.base/maxactive.exp | 2 +-
 testsuite/systemtap.base/probefunc.exp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/maxactive.exp b/testsuite/systemtap.base/maxactive.exp
index e2175d17..ca95ac53 100644
--- a/testsuite/systemtap.base/maxactive.exp
+++ b/testsuite/systemtap.base/maxactive.exp
@@ -49,7 +49,7 @@ set skipped2 $skipped_probes
 # time of the scripts.
 set test "MAXACTIVE03"
 if {$skipped1 <= $skipped2} {
-    pass "$test ($skipped1 skipped probes <= $skipped2 skipped probes)"
+    pass $test
 } else {
     fail "$test ($skipped1 skipped probes > $skipped2 skipped probes)"
 }
diff --git a/testsuite/systemtap.base/probefunc.exp b/testsuite/systemtap.base/probefunc.exp
index fbb45534..e5abe22a 100644
--- a/testsuite/systemtap.base/probefunc.exp
+++ b/testsuite/systemtap.base/probefunc.exp
@@ -42,7 +42,7 @@ set prefix "probefunc:"
 set output_string "\\mscheduler_tick\\M\r\n"
 set probepoint "kernel.statement(0x$addr).absolute"
 set script [format $systemtap_script $probepoint]
-stap_run $prefix$probepoint sleep_one_sec $output_string -g -e $script
+stap_run "${prefix}.statement.(0xaddr).absolute" sleep_one_sec $output_string -g -e $script
 
 # test probefunc() with kernel.function()
 set probepoint "kernel.function(\"scheduler_tick\")"
-- 
cgit 


From c039c2b968029a84f2554f1c28cd738aa28b730a Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Thu, 27 Mar 2008 17:19:42 +0000
Subject: 2008-03-27  Frank Ch. Eigler  <fche@elastic.org>

	* systemtap.base/cmd_parse.exp: Don't assume $SHELL=bash.
---
 testsuite/systemtap.base/cmd_parse.exp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/cmd_parse.exp b/testsuite/systemtap.base/cmd_parse.exp
index cf15698f..ff347a9d 100644
--- a/testsuite/systemtap.base/cmd_parse.exp
+++ b/testsuite/systemtap.base/cmd_parse.exp
@@ -56,7 +56,8 @@ expect {
 wait
 
 #stap -c '(((a=42+7)); echo "The answer is $a")' -e 'probe begin {}'
-spawn stap -c {(((a=42+7)); echo "The answer is $a")} -e {probe begin {}}
+# NB: not  ((a=42+7)) - must not assume bash
+spawn stap -c {(a=49; echo "The answer is $a")} -e {probe begin {}}
 expect {
     -timeout 60
     "The answer is 49" {pass "cmd_parse6"}
-- 
cgit