summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenji Huang <wenji.huang@oracle.com>2008-11-03 01:58:48 -0500
committerWenji Huang <wenji.huang@oracle.com>2008-11-03 01:58:48 -0500
commit8576ea4be5619d9c169cab385ac0d31174fdee41 (patch)
tree41574e5224c9b8af2ca64d4e85b3900d775708a1
parent3be7261ad2c9496868e131147770fb3e9e409679 (diff)
downloadsystemtap-steved-8576ea4be5619d9c169cab385ac0d31174fdee41.tar.gz
systemtap-steved-8576ea4be5619d9c169cab385ac0d31174fdee41.tar.xz
systemtap-steved-8576ea4be5619d9c169cab385ac0d31174fdee41.zip
Fix hung test due to workaround for PR6964.
-rw-r--r--testsuite/ChangeLog4
-rw-r--r--testsuite/systemtap.base/cmd_parse.exp14
2 files changed, 11 insertions, 7 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index b239477a..d0a3a4f4 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-03 Wenji Huang <wenji.huang@oracle.com>
+
+ * systemtap.base/cmd_parse.exp: Add exit() to probe.
+
2008-10-29 Frank Ch. Eigler <fche@elastic.org>
* systemtap.base/vars.exp: Remove "2>&1" that left turds behind.
diff --git a/testsuite/systemtap.base/cmd_parse.exp b/testsuite/systemtap.base/cmd_parse.exp
index 733881a1..ef32798e 100644
--- a/testsuite/systemtap.base/cmd_parse.exp
+++ b/testsuite/systemtap.base/cmd_parse.exp
@@ -5,7 +5,7 @@ if {![installtest_p]} {
return
}
-spawn stap -c {echo "hello world"} -we {probe begin {}}
+spawn stap -c {echo "hello world"} -we {probe begin {exit()}}
expect {
-timeout 60
"hello world" {pass "cmd_parse1"}
@@ -14,7 +14,7 @@ expect {
}
wait;close
-spawn stap -c {echo "hello "\"world\"} -we {probe begin {}}
+spawn stap -c {echo "hello "\"world\"} -we {probe begin {exit()}}
expect {
-timeout 60
"hello \"world\"" {pass "cmd_parse2"}
@@ -23,7 +23,7 @@ expect {
}
wait;close
-spawn stap -c {sh -c '(a="hello world"; echo $a)'} -we {probe begin {}}
+spawn stap -c {sh -c '(a="hello world"; echo $a)'} -we {probe begin {exit()}}
expect {
-timeout 60
"hello world" {pass "cmd_parse3"}
@@ -32,7 +32,7 @@ expect {
}
wait;close
-spawn stap -c {sh -c '(a="hello "\"world\"; echo $a)'} -we {probe begin {}}
+spawn stap -c {sh -c '(a="hello "\"world\"; echo $a)'} -we {probe begin {exit()}}
expect {
-timeout 60
"hello \"world\"" {pass "cmd_parse4"}
@@ -41,7 +41,7 @@ expect {
}
wait;close
-spawn stap -c {sh -c '(a="hello "world; echo $a)'} -we {probe begin {}}
+spawn stap -c {sh -c '(a="hello "world; echo $a)'} -we {probe begin {exit()}}
expect {
-timeout 60
"hello world" {pass "cmd_parse5"}
@@ -50,7 +50,7 @@ expect {
}
wait;close
-spawn stap -c {bash -c '((a=42+7)); echo "The answer is $a"'} -we {probe begin {}}
+spawn stap -c {bash -c '((a=42+7)); echo "The answer is $a"'} -we {probe begin {exit()}}
expect {
-timeout 60
"The answer is 49" {pass "cmd_parse6"}
@@ -59,7 +59,7 @@ expect {
}
wait;close
-spawn stap -c {sh -c '(echo "Hello World" 1>&2) > /dev/null'} -we {probe begin {}}
+spawn stap -c {sh -c '(echo "Hello World" 1>&2) > /dev/null'} -we {probe begin {exit()}}
expect {
-timeout 60
"Hello World" {pass "cmd_parse7"}