6 files changed, 12 insertions, 7 deletions
diff --git a/testsuite/systemtap.maps/absentstats.exp b/testsuite/systemtap.maps/absentstats.exp
index 38cdbd07..f0e99a86 100644
--- a/testsuite/systemtap.maps/absentstats.exp
+++ b/testsuite/systemtap.maps/absentstats.exp
@@ -10,7 +10,7 @@ set ko 0
 spawn stap -DMAXERRORS=20 $srcdir/$subdir/$test.stp
 # spawn echo hello children 0
 expect {
-  -timeout 60
+  -timeout 150
   -re {^ERROR: empty aggregate[^\r]*\r} { incr ko ; exp_continue }
   -re {^WARNING: Number of errors} { incr ko ; exp_continue }
   -re {^0\r} { incr ok ; exp_continue }
diff --git a/testsuite/systemtap.maps/foreach_fail.exp b/testsuite/systemtap.maps/foreach_fail.exp
index 6d5439b7..75fcfcc4 100644
--- a/testsuite/systemtap.maps/foreach_fail.exp
+++ b/testsuite/systemtap.maps/foreach_fail.exp
@@ -7,6 +7,7 @@ if {![installtest_p]} { untested $test; return }
 
 spawn stap  $srcdir/$subdir/$test.stp
 expect {
+  -timeout 60
   timeout { 
     fail "$test timed out" }
   eof { 
diff --git a/testsuite/systemtap.maps/ix_clear.exp b/testsuite/systemtap.maps/ix_clear.exp
index 0ccc6563..0c6ca6c3 100644
--- a/testsuite/systemtap.maps/ix_clear.exp
+++ b/testsuite/systemtap.maps/ix_clear.exp
@@ -9,10 +9,11 @@ set pass_result {foo\[1\] = 1 1*ERROR: empty aggregate*}
 # spawn test
 spawn stap $srcdir/$subdir/$test.stp
 expect {
+  -timeout 150
   $pass_result {
     pass "$test passed"
   }
-  -timeout 30 { 
+  timeout { 
     send "\003"
     fail "$test timed out"
   }
diff --git a/testsuite/systemtap.maps/ix_clear2.exp b/testsuite/systemtap.maps/ix_clear2.exp
index 75a2cf2a..c5e72c36 100644
--- a/testsuite/systemtap.maps/ix_clear2.exp
+++ b/testsuite/systemtap.maps/ix_clear2.exp
@@ -10,10 +10,11 @@ set pass_result {foo\[1\] = 1 1*ERROR: empty aggregate*}
 # spawn test
 spawn stap $srcdir/$subdir/$test.stp
 expect {
+  -timeout 150
   $pass_result {
     pass "$test passed"
   }
-  -timeout 30 { 
+  timeout {
     send "\003"
     fail "$test timed out"
   }
diff --git a/testsuite/systemtap.maps/ix_clear3.exp b/testsuite/systemtap.maps/ix_clear3.exp
index 4ca44008..7674fdbc 100644
--- a/testsuite/systemtap.maps/ix_clear3.exp
+++ b/testsuite/systemtap.maps/ix_clear3.exp
@@ -8,10 +8,11 @@ set pass_result {*ERROR: empty aggregate*}
 # spawn test
 spawn stap $srcdir/$subdir/$test.stp
 expect {
+  -timeout 150
   $pass_result {
     pass "$test passed"
   }
-  -timeout 30 { 
+  timeout {
     send "\003"
     fail "$test timed out"
   }
diff --git a/testsuite/systemtap.maps/pmap_agg_overflow.exp b/testsuite/systemtap.maps/pmap_agg_overflow.exp
index f3da88fe..a3d22dc2 100644
--- a/testsuite/systemtap.maps/pmap_agg_overflow.exp
+++ b/testsuite/systemtap.maps/pmap_agg_overflow.exp
@@ -3,19 +3,20 @@
 set test "pmap_agg_overflow"
 if {![installtest_p]} { untested $test; return }
 
-set pass_result "^(ERROR: .*overflow.*\r\n){2}WARNING: Number of errors: 2, skipped probes: 0\r\n$"
-set skip_result "^WARNING: This test only applies to smp systems...\r\n$"
+set pass_result "^(ERROR: \[^\r\]*overflow\[^\r\]*\r\n){2}WARNING: Number of errors: 2, skipped probes: 0\r\n$"
+set skip_result "^WARNING: This test only applies to smp systems\.\.\.\r\n"
 
 # spawn test
 spawn stap -DMAXERRORS=1 -g $srcdir/$subdir/$test.stp
 expect {
+  -timeout 240
   -re $pass_result {
     pass "$test passed"
   }
   -re $skip_result {
     unsupported "$test requires smp"
   }
-  -timeout 30 { 
+  timeout {
     send "\003"
     fail "$test timed out"
   }