2007-05-25 Martin Hunt <hunt@redhat.com>

	* systemtap.samples/lket.exp (cleanfiles): Set timeout inside expect.
	* systemtap.maps/absentstats.exp: Set timeout inside expect.
	* lib/stap_run2.exp (stap_run2): Set timeout to 180 inside expect.
	* lib/stap_run.exp (stap_run): Set timeout to 180 for slower machines.
	Remove $ anchor on output. Fix a few minor nits in patterns.

2 files changed, 48 insertions, 47 deletions

diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp
index baf41d9b..8b1c8eaa 100644
--- a/testsuite/lib/stap_run.exp
+++ b/testsuite/lib/stap_run.exp
@@ -31,12 +31,13 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args }
     }
     eval spawn $cmd
     expect {
-	-re {^Pass\ ([1234]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms.\r\n}
+	-timeout 180
+	-re {^Pass\ ([1234]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms\.\r\n}
 	{set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"; exp_continue}
-	-re {^Pass\ ([34]): using cached .+\r\n}
+	-re {^Pass\ ([34]): using cached [^\r]+\r\n}
 	{set pass$expect_out(1,string) "\t0\t0\t0"; exp_continue}
 	-re {^Pass 5: starting run.\r\n} {exp_continue}
-	-timeout 30 -re "^systemtap starting probe\r\n" {
+	-re "^systemtap starting probe\r\n" {
 	    pass "$TEST_NAME startup"
 	    if {$LOAD_GEN_FUNCTION != ""} then {
 		#run the interesting test here
@@ -50,13 +51,14 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args }
 	    send "\003"
 
 	    # check the output to see if it is sane
-	    set output "^systemtap ending probe\r\n$OUTPUT_CHECK_STRING$"
+	    set output "^systemtap ending probe\r\n$OUTPUT_CHECK_STRING"
 
 	    expect {
+		-timeout 20
 		-re  $output {
 		    pass "$TEST_NAME shutdown and output"
 		    expect {
-			-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 pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"
 			    verbose -log "metric:\t$TEST_NAME $pass1$pass2$pass3$pass4$pass5"}
 			-re {^WARNING: Number of errors: ([0-9]+), skipped probes: ([0-9]+)\r\n}
diff --git a/testsuite/lib/stap_run2.exp b/testsuite/lib/stap_run2.exp
index 290f0d84..254b4e5a 100644
--- a/testsuite/lib/stap_run2.exp
+++ b/testsuite/lib/stap_run2.exp
@@ -8,49 +8,48 @@
 #
 # global result_string must be set to the expected output
 
-set timeout 20
-
 proc stap_run2 { TEST_NAME args } {
-  # zap the srcdir prefix
-  set test_file_name $TEST_NAME
-  set TEST_NAME [regsub {.*/testsuite/} $TEST_NAME ""]
-
-  if {[info procs installtest_p] != "" && ![installtest_p]} { untested $TEST_NAME; return }
-
-  # fix up expected string
-  regsub -all \n $::result_string \r\n output
-
-  # spawn test
-  set cmd [concat {stap -v} $args]
-  if [file readable $test_file_name] {
-      lappend cmd $test_file_name
-  }
-  eval spawn $cmd
-
-  expect {
-    -re {^Pass\ ([1234]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms.\r\n}
-    {set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"; exp_continue}
-    -re {^Pass\ ([34]): using cached .+\r\n}
-    {set pass$expect_out(1,string) "\t0\t0\t0"; exp_continue}
-    -re {^Pass 5: starting run.\r\n} {exp_continue}
-    -ex $output {
-      pass "$TEST_NAME"
-      expect {
-	-re {^Pass\ ([5]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms.\r\n}
-	{set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"
-	  verbose -log "metric:\t$TEST_NAME $pass1$pass2$pass3$pass4$pass5"}
-        }
+    # zap the srcdir prefix
+    set test_file_name $TEST_NAME
+    set TEST_NAME [regsub {.*/testsuite/} $TEST_NAME ""]
+    
+    if {[info procs installtest_p] != "" && ![installtest_p]} { untested $TEST_NAME; return }
+    
+    # fix up expected string
+    regsub -all \n $::result_string \r\n output
+    
+    # spawn test
+    set cmd [concat {stap -v} $args]
+    if [file readable $test_file_name] {
+	lappend cmd $test_file_name
     }
-    timeout { 
-      fail "$TEST_NAME timed out" }
-    eof { 
-      fail "$TEST_NAME unexpected EOF" }
-    -re "semantic error:" { fail "$TEST_NAME compilation" }
-    -re "ERROR:" { 
-      send "\003"
-      fail "$TEST_NAME runtime error" 
+    eval spawn $cmd
+    
+    expect {
+	-timeout 180
+	-re {^Pass\ ([1234]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms.\r\n}
+	{set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"; exp_continue}
+	-re {^Pass\ ([34]): using cached .+\r\n}
+	{set pass$expect_out(1,string) "\t0\t0\t0"; exp_continue}
+	-re {^Pass 5: starting run.\r\n} {exp_continue}
+	-ex $output {
+	    pass "$TEST_NAME"
+	    expect {
+		-re {^Pass\ ([5]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms.\r\n}
+		{set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"
+		    verbose -log "metric:\t$TEST_NAME $pass1$pass2$pass3$pass4$pass5"}
+	    }
+	}
+	timeout { 
+	    fail "$TEST_NAME timed out" }
+	eof { 
+	    fail "$TEST_NAME unexpected EOF" }
+	-re "semantic error:" { fail "$TEST_NAME compilation" }
+	-re "ERROR:" { 
+	    send "\003"
+	    fail "$TEST_NAME runtime error" 
+	}
     }
-  }
-  catch close
-  wait
+    catch close
+    wait
 }