context.exp test improvements.

* testsuite/systemtap.context/args.tcl: Increased timeout.  If tests do
  timeout, fail (instead of silently failing).
* testsuite/systemtap.context/num_args.tcl: Ditto.
* testsuite/systemtap.context/backtrace.tcl: Increase timeout.
* testsuite/systemtap.context/pid.tcl: Ditto.

diff --git a/testsuite/systemtap.context/args.tcl b/testsuite/systemtap.context/args.tcl
index fb8aecb473469a4c59852373abbc77b05992a426..c5aed203f187cfd4f013717bdff5d8bdf365c6ed 100644 (file)
--- a/testsuite/systemtap.context/args.tcl
+++ b/testsuite/systemtap.context/args.tcl
@@ -1,6 +1,6 @@
 spawn stap $srcdir/$subdir/args.stp
 expect {
-    -timeout 60
+    -timeout 120
     "READY" {
        exec echo 1 > /proc/stap_test_cmd
        expect {
@@ -51,6 +51,7 @@ expect {
            timeout {fail "string function arguments"}
        }
     }
+    timeout {fail "all args tests - timeout"}
     eof {fail "function arguments: unexpected timeout"}
 }
 exec kill -INT -[exp_pid]

diff --git a/testsuite/systemtap.context/backtrace.tcl b/testsuite/systemtap.context/backtrace.tcl
index 5e7b15361a5dd49cec817b87a25484ed60af865f..d436ab5c93e8852c60690594d0b17a5ac345ae26 100644 (file)
--- a/testsuite/systemtap.context/backtrace.tcl
+++ b/testsuite/systemtap.context/backtrace.tcl
@@ -9,7 +9,7 @@ set m6 0
 spawn stap $srcdir/$subdir/backtrace.stp
 #exp_internal 1
 expect {
-    -timeout 60
+    -timeout 120
     "Systemtap probe: begin\r\n" {
        pass "backtrace of begin probe"
        exec echo 0 > /proc/stap_test_cmd

diff --git a/testsuite/systemtap.context/num_args.tcl b/testsuite/systemtap.context/num_args.tcl
index 62ac8dd37a9be3b7432bbb4059bc09713175034e..d677f8491b56b0a364a49a412bf76e698e1af103 100644 (file)
--- a/testsuite/systemtap.context/num_args.tcl
+++ b/testsuite/systemtap.context/num_args.tcl
@@ -3,7 +3,7 @@ foreach arglist $arglists {
 set tag [concat numeric $arglist]
 eval spawn stap $arglist $srcdir/$subdir/num_args.stp
 expect {
-    -timeout 60
+    -timeout 120
     "READY" {
        exec echo 1 > /proc/stap_test_cmd
        expect {
@@ -57,6 +57,7 @@ expect {
     -re "semantic error:" {
        fail "function arguments -- $tag: compilation failed"
     }
+    timeout {fail "all function arguments tests - timeout"}
     eof {fail "function arguments -- $tag: unexpected timeout"}
 }
 exec kill -INT -[exp_pid]

diff --git a/testsuite/systemtap.context/pid.tcl b/testsuite/systemtap.context/pid.tcl
index 70a87345b8168de36a125546c40394b2cd31e256..350a05b267fee1e88773a54e9d3f89a87150ac9c 100644 (file)
--- a/testsuite/systemtap.context/pid.tcl
+++ b/testsuite/systemtap.context/pid.tcl
@@ -2,7 +2,7 @@ set tests [list execname pexecname pid ppid tid uid euid gid egid]
 spawn stap $srcdir/$subdir/pid.stp
 #exp_internal 1
 expect {
-    -timeout 60
+    -timeout 120
     "READY" {
        set pid [exec echo 1 > /proc/stap_test_cmd &]
        set ppid {[0-9]*}