2007-06-18 Martin Hunt <hunt@redhat.com>

	 From Quentin Barnes.
	* lib/stap_run.exp, lib/stap_run2.exp, lib/systemtap.exp,
	systemtap.base/cache.exp, systemtap.base/optim.exp,
	systemtap.base/overload.exp, systemtap.base/prologues.exp,
	systemtap.maps/absentstats.exp, systemtap.maps/foreach_fail.exp,
	systemtap.maps/ix_clear*.exp, systemtap.maps/pmap_agg_overflow.exp,
	systemtap.samples/args.exp, systemtap.samples/arith.exp,
	systemtap.samples/arith_limits.exp,
	systemtap.samples/control_limits.exp, systemtap.samples/lket.exp,
	systemtap.samples/pfaults.exp, systemtap.samples/poll_map.exp,
	systemtap.samples/primes.exp, systemtap.samples/profile.exp,
	systemtap.samples/queue_demo.exp, systemtap.samples/symbols.exp,
	systemtap.samples/syscalls1.exp, systemtap.samples/syscalls2.exp,
	systemtap.samples/transport.exp: Small fixes to patterns, plus
	fix timeouts for slower systems.

14 files changed, 29 insertions, 24 deletions

diff --git a/testsuite/systemtap.samples/args.exp b/testsuite/systemtap.samples/args.exp
index d147d21d..394ca9ed 100644
--- a/testsuite/systemtap.samples/args.exp
+++ b/testsuite/systemtap.samples/args.exp
@@ -15,7 +15,7 @@ set modname "args_[pid]"
 spawn stap -k -p4 -m $modname $srcdir/$subdir/args.stp
 set tmpdir NO_SUCH_FILE
 expect {
-    -timeout 30
+    -timeout 120
     -re {Keeping temporary directory "([/a-zA-Z0-9_]*)"} { pass "$test compile";
 					set tmpdir $expect_out(1,string) }
     timeout { fail "$test compile (timeout)" }
@@ -40,7 +40,7 @@ if [file exists $modpath] {
 spawn sudo $staprunpath -d [pid] $modpath foo=hello bar=999
 set ok 0
 expect {
-    -timeout 30
+    -timeout 120
     -re {foo=hello bar=999} { incr ok }
     timeout { }
     eof { }
@@ -55,7 +55,7 @@ if {$ok == 1} {
 spawn sudo $staprunpath -d [pid] $modpath foo=goodbye bar=0
 set ok 0
 expect {
-    -timeout 30
+    -timeout 120
     -re {foo=goodbye bar=0} { incr ok }
     timeout { }
     eof { }
diff --git a/testsuite/systemtap.samples/arith.exp b/testsuite/systemtap.samples/arith.exp
index cd00ab71..c4f72793 100644
--- a/testsuite/systemtap.samples/arith.exp
+++ b/testsuite/systemtap.samples/arith.exp
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; return }
 spawn stap -DMAXNESTING=5 $srcdir/$subdir/arith.stp
 set ok 0
 expect {
-    -timeout 30
+    -timeout 150
     -re {passes: [0-9]* failures: 0} { incr ok }
     timeout { fail "$test (timeout)" }
     eof { }
diff --git a/testsuite/systemtap.samples/arith_limits.exp b/testsuite/systemtap.samples/arith_limits.exp
index 365c65db..93794c8e 100644
--- a/testsuite/systemtap.samples/arith_limits.exp
+++ b/testsuite/systemtap.samples/arith_limits.exp
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; return }
 spawn stap -DMAXNESTING=5 $srcdir/$subdir/arith_limits.stp
 set ok 0
 expect {
-    -timeout 30
+    -timeout 150
     -re {passes: [0-9]* failures: 0} { incr ok }
     timeout { fail "$test (timeout)" }
     eof { }
diff --git a/testsuite/systemtap.samples/control_limits.exp b/testsuite/systemtap.samples/control_limits.exp
index c5cbfac3..513b2c4d 100644
--- a/testsuite/systemtap.samples/control_limits.exp
+++ b/testsuite/systemtap.samples/control_limits.exp
@@ -4,7 +4,8 @@ if {![installtest_p]} { untested $test; return }
 spawn stap -u -DMAXNESTING=5 $srcdir/$subdir/control_limits.stp
 set ok 0
 expect {
-    -timeout 60 -re {ERROR.*MAXNESTING} { incr ok; exp_continue }
+    -timeout 150
+    -re {ERROR.*MAXNESTING} { incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
 }
@@ -14,7 +15,8 @@ set test "control_limits MAXACTION"
 spawn stap -u -DMAXACTION_INTERRUPTIBLE=500 $srcdir/$subdir/control_limits.stp
 set ok 0
 expect {
-    -timeout 60 -re {ERROR.*MAXACTION} { incr ok; exp_continue }
+    -timeout 150
+    -re {ERROR.*MAXACTION} { incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
 }
@@ -24,7 +26,8 @@ set test "control_limits MAXSTRINGLEN small"
 spawn stap -u -DMAXSTRINGLEN=50 $srcdir/$subdir/control_limits.stp
 set ok 0
 expect {
-    -timeout 60 -re {ERROR.*MAXSTRINGLEN reduced} { incr ok; exp_continue }
+    -timeout 150
+    -re {ERROR.*MAXSTRINGLEN reduced} { incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
 }
@@ -34,7 +37,8 @@ set test "control_limits MAXSTRINGLEN large"
 spawn stap -u -DMAXSTRINGLEN=500 $srcdir/$subdir/control_limits.stp
 set ok 0
 expect {
-    -timeout 60 -re {ERROR.*MAXSTRINGLEN enlarged} { incr ok; exp_continue }
+    -timeout 150
+    -re {ERROR.*MAXSTRINGLEN enlarged} { incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
 }
diff --git a/testsuite/systemtap.samples/lket.exp b/testsuite/systemtap.samples/lket.exp
index 10ca7a28..d6af897c 100644
--- a/testsuite/systemtap.samples/lket.exp
+++ b/testsuite/systemtap.samples/lket.exp
@@ -9,7 +9,7 @@ if {[info procs installtest_p]!="" && ![installtest_p]} {untested $test; return}
 
 eval spawn stap -v -DMAXSKIPPED=100000 -bM $srcdir/$subdir/lket.stp
 set failed 1
-set timeout 180
+set timeout 1800
 expect {
     -re {^Pass\ ([1234]):\ [^\r]*\r\n} {
         set detail "pass$expect_out(1,string)"; 
@@ -19,7 +19,7 @@ expect {
         set detail "stap runtime";
         exp_continue
     }
-    -re {Pass\ 5:[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms.\r\n} {
+    -re {Pass\ 5:[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms\.\r\n} {
         set failed 0
     }
     -re {parse error|semantic error} {set detail "$expect_out(0,string)"}
diff --git a/testsuite/systemtap.samples/pfaults.exp b/testsuite/systemtap.samples/pfaults.exp
index 30599df5..7675078c 100644
--- a/testsuite/systemtap.samples/pfaults.exp
+++ b/testsuite/systemtap.samples/pfaults.exp
@@ -5,9 +5,8 @@ spawn stap -g $srcdir/$subdir/pfaults.stp
 set pid $spawn_id
 set ok 0
 expect {
-    -timeout 30
+  -timeout 240
   -re {Page fault tracking, start time[^\r\n]+\r\n} { incr ok; exp_continue }
-    -timeout 30
   -re {Page fault tracking, end time[^\r\n]+\r\n} { incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
diff --git a/testsuite/systemtap.samples/poll_map.exp b/testsuite/systemtap.samples/poll_map.exp
index 6e26380a..5ade48e6 100644
--- a/testsuite/systemtap.samples/poll_map.exp
+++ b/testsuite/systemtap.samples/poll_map.exp
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; return }
 spawn stap -g $srcdir/$subdir/poll_map.stp
 set ok 0
 expect {
-    -timeout 90
+    -timeout 400
     -ex "SUCCESS" { incr ok }
     timeout { fail "$test (timeout)" }
     eof { }
diff --git a/testsuite/systemtap.samples/primes.exp b/testsuite/systemtap.samples/primes.exp
index 5381494d..f99f67cc 100644
--- a/testsuite/systemtap.samples/primes.exp
+++ b/testsuite/systemtap.samples/primes.exp
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; return }
 spawn stap $srcdir/$subdir/primes.stp
 set ok 0
 expect {
-    -timeout 30
+    -timeout 150
     -ex {odds[0] = 1} { incr ok; exp_continue }
     -ex {odds[1] = 3} { incr ok; exp_continue }
     -ex {odds[3] = 7} { incr ok; exp_continue }
diff --git a/testsuite/systemtap.samples/profile.exp b/testsuite/systemtap.samples/profile.exp
index f1dc1b79..249a1589 100644
--- a/testsuite/systemtap.samples/profile.exp
+++ b/testsuite/systemtap.samples/profile.exp
@@ -4,7 +4,8 @@ if {![installtest_p]} { untested $test; return }
 spawn stap $srcdir/$subdir/profile.stp
 set ok 0
 expect {
-    -timeout 60 -re {kernel.function[^\r]*ttime=[0-9]*\r} { incr ok; exp_continue }
+    -timeout 360
+    -re {kernel.function[^\r]*ttime=[0-9]*\r} { incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
 }
diff --git a/testsuite/systemtap.samples/queue_demo.exp b/testsuite/systemtap.samples/queue_demo.exp
index 71feddd6..49dfac05 100644
--- a/testsuite/systemtap.samples/queue_demo.exp
+++ b/testsuite/systemtap.samples/queue_demo.exp
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; return }
 spawn stap $srcdir/$subdir/queue_demo.stp
 set ok 0
 expect {
-    -timeout 30
+    -timeout 240
     -re {block-[^\r]*} { incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
diff --git a/testsuite/systemtap.samples/symbols.exp b/testsuite/systemtap.samples/symbols.exp
index 52e90e93..0c599b58 100644
--- a/testsuite/systemtap.samples/symbols.exp
+++ b/testsuite/systemtap.samples/symbols.exp
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; return }
 spawn stap -g $srcdir/$subdir/symbols.stp
 set ok 0
 expect {
-    -timeout 30
+    -timeout 120
     -re { 0x[a-f0-9]+[^\r]*\r} { incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
diff --git a/testsuite/systemtap.samples/syscalls1.exp b/testsuite/systemtap.samples/syscalls1.exp
index edfddf6f..eb8a0c6d 100644
--- a/testsuite/systemtap.samples/syscalls1.exp
+++ b/testsuite/systemtap.samples/syscalls1.exp
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; return }
 spawn stap -p2 $srcdir/$subdir/syscalls.stp
 set ok 0
 expect {
-    -timeout 30
+    -timeout 180
     -re {kernel.function[^\r]*sys_[^\r]*\r} { incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
diff --git a/testsuite/systemtap.samples/syscalls2.exp b/testsuite/systemtap.samples/syscalls2.exp
index c817f23f..7bbd9a51 100644
--- a/testsuite/systemtap.samples/syscalls2.exp
+++ b/testsuite/systemtap.samples/syscalls2.exp
@@ -3,7 +3,8 @@ if {![installtest_p]} { untested $test; return }
 spawn stap $srcdir/$subdir/syscalls.stp
 set ok 0
 expect {
-    -timeout 60 -re {[0-9]* kernel.function[^\r]*\r} { incr ok; exp_continue }
+    -timeout 240
+    -re {[0-9]* kernel.function[^\r]*\r} { incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
 }
diff --git a/testsuite/systemtap.samples/transport.exp b/testsuite/systemtap.samples/transport.exp
index b7d6d77b..915452b6 100644
--- a/testsuite/systemtap.samples/transport.exp
+++ b/testsuite/systemtap.samples/transport.exp
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; return }
 spawn stap -o probe.out -DMAXACTION=1000000 $srcdir/$subdir/transport1.stp
 set ok 0
 expect {
-    -timeout 60
+    -timeout 150
     timeout { fail "$test (timeout)" }
     eof { spawn $srcdir/$subdir/transport-counts probe.out
 	expect {
@@ -22,7 +22,7 @@ set test "transport normal - relayfs"
 spawn stap -b -o probe.out -DMAXACTION=1000000 $srcdir/$subdir/transport1.stp
 set ok 0
 expect {
-    -timeout 60
+    -timeout 150
     timeout { fail "$test (timeout)" }
     eof { spawn $srcdir/$subdir/transport-counts probe.out
 	expect {
@@ -40,7 +40,7 @@ set test "transport fill staging buffer - procfs"
 spawn stap -o probe.out -DMAXACTION=1000000 $srcdir/$subdir/transport2.stp
 set ok 0
 expect {
-    -timeout 60
+    -timeout 150
     timeout { fail "$test (timeout)" }
     eof { spawn $srcdir/$subdir/transport-counts probe.out
 	expect {
@@ -58,7 +58,7 @@ set test "transport fill staging buffer - relayfs"
 spawn stap -b -o probe.out -DMAXACTION=1000000 $srcdir/$subdir/transport2.stp
 set ok 0
 expect {
-    -timeout 60
+    -timeout 150
     timeout { fail "$test (timeout)" }
     eof { spawn $srcdir/$subdir/transport-counts probe.out
 	expect {