diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-11-12 18:30:28 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-11-12 18:30:50 -0500 |
| commit | 588b83de0b2c3afdc06e9f84254f0b233c853736 (patch) | |
| tree | 1ff06d4ea13264a05e053aa2d834dfe52d1710cf | |
| parent | d87442b6e2f358c5843134a5a0a5b123d5446d97 (diff) | |
| download | systemtap-steved-588b83de0b2c3afdc06e9f84254f0b233c853736.tar.gz systemtap-steved-588b83de0b2c3afdc06e9f84254f0b233c853736.tar.xz systemtap-steved-588b83de0b2c3afdc06e9f84254f0b233c853736.zip | |
PR6964: Revert "Fix hung test due to workaround for PR6964."
This reverts commit 8576ea4be5619d9c169cab385ac0d31174fdee41.
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.base/cmd_parse.exp | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 658e9c98..a59d3a05 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-11-12 Frank Ch. Eigler <fche@elastic.org> + + PR6964. + * systemtap.base/cmd_parse.exp: Remove exit() hack. + 2008-11-12 David Smith <dsmith@redhat.com> * systemtap.context/num_args.tcl: Improved error handling of diff --git a/testsuite/systemtap.base/cmd_parse.exp b/testsuite/systemtap.base/cmd_parse.exp index ef32798e..733881a1 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 {exit()}} +spawn stap -c {echo "hello world"} -we {probe begin {}} expect { -timeout 60 "hello world" {pass "cmd_parse1"} @@ -14,7 +14,7 @@ expect { } wait;close -spawn stap -c {echo "hello "\"world\"} -we {probe begin {exit()}} +spawn stap -c {echo "hello "\"world\"} -we {probe begin {}} 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 {exit()}} +spawn stap -c {sh -c '(a="hello world"; echo $a)'} -we {probe begin {}} 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 {exit()}} +spawn stap -c {sh -c '(a="hello "\"world\"; echo $a)'} -we {probe begin {}} 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 {exit()}} +spawn stap -c {sh -c '(a="hello "world; echo $a)'} -we {probe begin {}} 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 {exit()}} +spawn stap -c {bash -c '((a=42+7)); echo "The answer is $a"'} -we {probe begin {}} 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 {exit()}} +spawn stap -c {sh -c '(echo "Hello World" 1>&2) > /dev/null'} -we {probe begin {}} expect { -timeout 60 "Hello World" {pass "cmd_parse7"} |