PR11353: enable probe elision optimization

[systemtap.git] / testsuite / systemtap.base / cmd_parse.exp

diff --git a/testsuite/systemtap.base/cmd_parse.exp b/testsuite/systemtap.base/cmd_parse.exp
index ec1b518ae73223ae7b6323c9785f6d99bf3a7519..82c44608862ef044cf28eb706f04d11b156d5958 100644 (file)
--- a/testsuite/systemtap.base/cmd_parse.exp
+++ b/testsuite/systemtap.base/cmd_parse.exp
@@ -5,68 +5,68 @@ if {![installtest_p]} {
     return
 }
 
-spawn stap -c {echo "hello world"} -we {probe begin {}}
+spawn stap -u -c {echo "hello world"} -we {probe begin {}}
 expect {
     -timeout 60
     "hello world" {pass "cmd_parse1"}
     timeout {fail "cmd_parse1: unexpected timeout"}
     eof {fail "cmd_parse1: unexpected EOF"}
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
-spawn stap -c {echo "hello "\"world\"} -we {probe begin {}}
+spawn stap -u -c {echo "hello "\"world\"} -we {probe begin {}}
 expect {
     -timeout 60
     "hello \"world\"" {pass "cmd_parse2"}
     timeout {fail "cmd_parse2: unexpected timeout"}
     eof {fail "cmd_parse2: unexpected EOF"}
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
-spawn stap -c {sh -c '(a="hello world"; echo $a)'} -we {probe begin {}}
+spawn stap -u -c {sh -c '(a="hello world"; echo $a)'} -we {probe begin {}}
 expect {
     -timeout 60
     "hello world" {pass "cmd_parse3"}
     timeout {fail "cmd_parse3: unexpected timeout"}
     eof {fail "cmd_parse3: unexpected EOF"}
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
-spawn stap -c {sh -c '(a="hello "\"world\"; echo $a)'} -we {probe begin {}}
+spawn stap -u -c {sh -c '(a="hello "\"world\"; echo $a)'} -we {probe begin {}}
 expect {
     -timeout 60
     "hello \"world\"" {pass "cmd_parse4"}
     timeout {fail "cmd_parse4: unexpected timeout"}
     eof {fail "cmd_parse4: unexpected EOF"}
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
-spawn stap -c {sh -c '(a="hello "world; echo $a)'} -we {probe begin {}}
+spawn stap -u -c {sh -c '(a="hello "world; echo $a)'} -we {probe begin {}}
 expect {
     -timeout 60
     "hello world" {pass "cmd_parse5"}
     timeout {fail "cmd_parse5: unexpected timeout"}
     eof {fail "cmd_parse5: unexpected EOF"}
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
-spawn stap -c {bash -c '((a=42+7)); echo "The answer is $a"'} -we {probe begin {}}
+spawn stap -u -c {bash -c '((a=42+7)); echo "The answer is $a"'} -we {probe begin {}}
 expect {
     -timeout 60
     "The answer is 49" {pass "cmd_parse6"}
     timeout {fail "cmd_parse6: unexpected timeout"}
     eof {fail "cmd_parse6: unexpected EOF"}
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
-spawn stap -c {sh -c '(echo "Hello World" 1>&2) > /dev/null'} -we {probe begin {}}
+spawn stap -u -c {sh -c '(echo "Hello World" 1>&2) > /dev/null'} -we {probe begin {}}
 expect {
     -timeout 60
     "Hello World" {pass "cmd_parse7"}
     timeout {fail "cmd_parse7: unexpected timeout"}
     eof {fail "cmd_parse7: unexpected EOF"}
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
 # slow test case; requires kernel tracepoint query modules
 spawn stap -l {vm.*}
@@ -77,7 +77,7 @@ expect {
     timeout {fail "cmd_parse8: unexpected timeout"}
     eof {fail "cmd_parse8: unexpected EOF"}
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
 spawn stap -e {probe begin { printf("%d %s\n", argc, argv[$1]) exit() }} 1
 expect {
@@ -86,7 +86,7 @@ expect {
     timeout { fail "cmd_parse9 timeout" }
     eof { fail "cmd_parse9 eof" }
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
 spawn stap -e {probe begin { printf("%d %s\n", argc, argv[$1]) exit() }} 5 a b c d
 expect {
@@ -95,7 +95,7 @@ expect {
     timeout { fail "cmd_parse10 timeout" }
     eof { fail "cmd_parse10 eof" }
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
 spawn stap -e {probe begin { printf("%d %s\n", argc, argv[$1]) exit() }} 10 a b c d
 expect {
@@ -104,7 +104,7 @@ expect {
     timeout { fail "cmd_parse11 timeout" }
     eof { fail "cmd_parse11 eof" }
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
 spawn stap -e {probe begin { printf("%d %s\n", argc, argv[0]) exit() }}
 expect {
@@ -113,7 +113,7 @@ expect {
     timeout { fail "cmd_parse12 timeout" }
     eof { fail "cmd_parse12 eof" }
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
 spawn stap -L syscall.a*
 expect {
@@ -122,7 +122,7 @@ expect {
     timeout {fail "cmd_parse13: unexpected timeout"}
     eof {fail "cmd_parse13: unexpected EOF"}
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
 if {![catch { exec sh -c "stap -v -v --vp 01020 -h 2>&1 | grep -q 'add per-pass verbosity .23242.'" }]} {
     pass "cmd_parse14"
@@ -147,7 +147,7 @@ expect {
     timeout { fail "cmd_parse15: timeout" }
     eof { fail "cmd_parse15: eof" }
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
 set uname [exec uname -i]
 # normalize arch
@@ -162,7 +162,7 @@ expect {
     timeout { fail "cmd_parse16: timeout" }
     eof { fail "cmd_parse16: eof" }
 }
-wait;catch {close}
+catch { close }; catch { wait }
 
 # NB: when adding extra tests here, increment the ![installtest_p]
 # loop count too at the top.