2 files changed, 74 insertions, 0 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 16cacd3e..76154cc1 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-20  Martin Hunt  <hunt@redhat.com>
+
+	* systemtap.base/cmd_parse.exp: New file.  Test
+	command parsing for "-c".
+
 2007-08-20  David Smith  <dsmith@redhat.com>
 
 	* parseko/cmdline15.stp: Added new test to make sure options '-c
diff --git a/testsuite/systemtap.base/cmd_parse.exp b/testsuite/systemtap.base/cmd_parse.exp
new file mode 100644
index 00000000..31676a6f
--- /dev/null
+++ b/testsuite/systemtap.base/cmd_parse.exp
@@ -0,0 +1,69 @@
+if {![installtest_p]} {
+    for {set i 0} { $i < 8} {incr i} {
+        untested cmd_parse$i
+    }
+    return
+}
+
+# stap -c 'echo "hello world"' -e 'probe begin {}'
+spawn stap -c {echo "hello world"} -e {probe begin {}}
+expect {
+    -timeout 60
+    "hello world" {pass "cmd_parse1"}
+    timeout {fail "cmd_parse1: unexpected timeout"}
+    eof {fail "cmd_parse1: unexpected EOF"}
+}
+
+# stap -c 'echo "hello "\"world\"' -e 'probe begin {}'
+spawn stap -c {echo "hello "\"world\"} -e {probe begin {}}
+expect {
+    -timeout 60
+    "hello \"world\"" {pass "cmd_parse2"}
+    timeout {fail "cmd_parse2: unexpected timeout"}
+    eof {fail "cmd_parse2: unexpected EOF"}
+}
+
+#stap -c '(a="hello world"; echo $a)' -e 'probe begin {}'
+spawn stap -c {(a="hello world"; echo $a)} -e {probe begin {}}
+expect {
+    -timeout 60
+    "hello world" {pass "cmd_parse3"}
+    timeout {fail "cmd_parse3: unexpected timeout"}
+    eof {fail "cmd_parse3: unexpected EOF"}
+}
+
+#stap -c '(a="hello "\"world\"; echo $a)' -e 'probe begin {}'
+spawn stap -c {(a="hello "\"world\"; echo $a)} -e {probe begin {}}
+expect {
+    -timeout 60
+    "hello \"world\"" {pass "cmd_parse4"}
+    timeout {fail "cmd_parse4: unexpected timeout"}
+    eof {fail "cmd_parse4: unexpected EOF"}
+}
+
+#stap -c '(a="hello "world; echo $a)' -e 'probe begin {}'
+spawn stap -c {(a="hello "world; echo $a)} -e {probe begin {}}
+expect {
+    -timeout 60
+    "hello world" {pass "cmd_parse5"}
+    timeout {fail "cmd_parse5: unexpected timeout"}
+    eof {fail "cmd_parse5: unexpected EOF"}
+}
+
+#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 {}}
+expect {
+    -timeout 60
+    "The answer is 49" {pass "cmd_parse6"}
+    timeout {fail "cmd_parse6: unexpected timeout"}
+    eof {fail "cmd_parse6: unexpected EOF"}
+}
+
+#stap -c '(echo "Hello World" 1>&2) > /dev/null' -e 'probe begin {}'
+spawn stap -c {(echo "Hello World" 1>&2) > /dev/null} -e {probe begin {}}
+expect {
+    -timeout 60
+    "Hello World" {pass "cmd_parse7"}
+    timeout {fail "cmd_parse7: unexpected timeout"}
+    eof {fail "cmd_parse7: unexpected EOF"}
+}