Move common code from {maxmemory.exp,overload.exp} into stap_run_error.exp.

* testsuite/lib/stap_run_error.exp: New file.
* testsuite/config/unix.exp: Loads stap_run_error.exp.
* testsuite/systemtap.base/maxmemory.exp: Uses stap_run_error function
  instead of local code.
* testsuite/systemtap.base/overload.exp: Ditto.

1 files changed, 4 insertions, 53 deletions

diff --git a/testsuite/systemtap.base/overload.exp b/testsuite/systemtap.base/overload.exp
index ac9ceb24..26988efc 100644
--- a/testsuite/systemtap.base/overload.exp
+++ b/testsuite/systemtap.base/overload.exp
@@ -16,66 +16,17 @@ set script {
     }
 }
 
-# stap_run TEST_NAME EXPECT_OVERLOAD
-# TEST_NAME is name of the current test
-# EXPECT_OVERLOAD lets us know to expect and probe overload or not
-# Additional arguments are passed to stap as-is.
-proc stap_run_overload { TEST_NAME EXPECT_OVERLOAD args } {
-
-    set cmd [concat {stap -v} $args]
-    eval spawn $cmd
-    expect {
-	-timeout 150
-	-re {^Pass\ [1234]: [^\r]+real\ ms\.\r\n} {exp_continue}
-	-re {^Pass\ ([34]): using cached [^\r]+\r\n} {exp_continue}
-	-re {^Pass 5: starting run.\r\n} {exp_continue}
-	-re {ERROR: probe overhead exceeded threshold\r\n} {
-	    if {$EXPECT_OVERLOAD} {
-		pass "$TEST_NAME received expected overload"
-	    } else {
-		fail "$TEST_NAME unexpected overload"
-	    }
-	}
-	-re "^systemtap starting probe\r\n" {
-  	    exec kill -INT -[exp_pid]
-
-	    expect {
-		-timeout 10
-		-re {^systemtap ending probe\r\n} {
-		    if {$EXPECT_OVERLOAD} {
-			fail "$TEST_NAME didn't receive expected overload"
-		    } else {
-			pass "$TEST_NAME didn't overload"
-		    }
-		}
-		-re {ERROR: probe overhead exceeded threshold\r\n} {
-		    if {$EXPECT_OVERLOAD} {
-			pass "$TEST_NAME received expected overload"
-		    } else {
-			fail "$TEST_NAME unexpected overload"
-		    }
-		}
-	    }
-	}
-	-re "semantic error:" { fail "$TEST_NAME compilation" }
-	timeout { fail "$TEST_NAME startup (timeout)"; 
-   	          exec kill -INT -[exp_pid] }
-	eof { fail "$TEST_NAME startup (eof)" }
-    }
-    catch close
-    wait
-}
-
 # OVERLOAD1 tests to make sure normal operation doesn't receive an
 # overload indication
 set test "OVERLOAD1"
-stap_run_overload $test 0 -u -e $script
+set error "probe overhead exceeded threshold"
+stap_run_error $test 0 $error "" -u -e $script
 
 # OVERLOAD2 is the same script, but we're adjusting the
 # STP_OVERLOAD_INTERVAL and STP_OVERLOAD_THRESHOLD to low values so
 # that we *will* get an overload.
 set test "OVERLOAD2"
-stap_run_overload $test 1 -u -DSTP_OVERLOAD_INTERVAL=1000LL -DSTP_OVERLOAD_THRESHOLD=100LL -e $script
+stap_run_error $test 1 $error "" -u -DSTP_OVERLOAD_INTERVAL=1000LL -DSTP_OVERLOAD_THRESHOLD=100LL -e $script
 
 # OVERLOAD3 is the same script with the same low STP_OVERLOAD_INTERVAL
 # and STP_OVERLOAD_THRESHOLD values, but we're also specifying
@@ -83,4 +34,4 @@ stap_run_overload $test 1 -u -DSTP_OVERLOAD_INTERVAL=1000LL -DSTP_OVERLOAD_THRES
 # even though we have low overhead tuning values, we *shouldn't*
 # overload.
 set test "OVERLOAD3"
-stap_run_overload $test 0 -u -DSTP_NO_OVERLOAD -DSTP_OVERLOAD_INTERVAL=1000LL -DSTP_OVERLOAD_THRESHOLD=100LL -e $script
+stap_run_error $test 0 $error "" -u -DSTP_NO_OVERLOAD -DSTP_OVERLOAD_INTERVAL=1000LL -DSTP_OVERLOAD_THRESHOLD=100LL -e $script