20 files changed, 1 insertions, 44 deletions
diff --git a/testsuite/systemtap.base/add.exp b/testsuite/systemtap.base/add.exp
index e0522ae2..2bb9df8b 100644
--- a/testsuite/systemtap.base/add.exp
+++ b/testsuite/systemtap.base/add.exp
@@ -1,7 +1,5 @@
 # Simple function to test that systemtap addition works
 
-load_lib "stap_run.exp"
-
 set test "add"
 
 stap_run $srcdir/$subdir/$test.stp no_load $all_pass_string
diff --git a/testsuite/systemtap.base/array_size.exp b/testsuite/systemtap.base/array_size.exp
index 86aec8ab..8d79cfac 100644
--- a/testsuite/systemtap.base/array_size.exp
+++ b/testsuite/systemtap.base/array_size.exp
@@ -1,7 +1,5 @@
 # Check that specifying an array size gives more room than MAXMAPENTRIES
 
-load_lib "stap_run.exp"
-
 set test "array_size"
 
 stap_run $srcdir/$subdir/$test.stp no_load $all_pass_string -DMAXMAPENTRIES=1
diff --git a/testsuite/systemtap.base/be_order.exp b/testsuite/systemtap.base/be_order.exp
index a40c7684..bd83f0a7 100644
--- a/testsuite/systemtap.base/be_order.exp
+++ b/testsuite/systemtap.base/be_order.exp
@@ -1,7 +1,5 @@
 # Simple function to test that ordering of begin/end probes works
 
-load_lib "stap_run.exp"
-
 set test "be_order"
 
 stap_run $srcdir/$subdir/$test.stp no_load $all_pass_string
diff --git a/testsuite/systemtap.base/deref.exp b/testsuite/systemtap.base/deref.exp
index 1f00f00f..9986efef 100644
--- a/testsuite/systemtap.base/deref.exp
+++ b/testsuite/systemtap.base/deref.exp
@@ -1,7 +1,5 @@
 # Check that the deref mechanisms work correctly.
 
-load_lib "stap_run.exp"
-
 set test "deref"
 
 stap_run $srcdir/$subdir/$test.stp no_load $all_pass_string -g
diff --git a/testsuite/systemtap.base/div0.exp b/testsuite/systemtap.base/div0.exp
index 169ded56..bfd0186c 100644
--- a/testsuite/systemtap.base/div0.exp
+++ b/testsuite/systemtap.base/div0.exp
@@ -1,8 +1,6 @@
 # Simple function to test that systemtap divide by 0 doesn't kill the machine
 # FIXME correct the output check
 
-load_lib "stap_run.exp"
-
 set test "div0"
 
 set output_string "(.*)division by 0 near(.*)"
diff --git a/testsuite/systemtap.base/equal.exp b/testsuite/systemtap.base/equal.exp
index eda645d2..c9762bc9 100644
--- a/testsuite/systemtap.base/equal.exp
+++ b/testsuite/systemtap.base/equal.exp
@@ -1,7 +1,5 @@
 # Simple function to test that equal operation works
 
-load_lib "stap_run.exp"
-
 set test "equal"
 
 # better have a count other than zero to show that probe fired
diff --git a/testsuite/systemtap.base/finloop2.exp b/testsuite/systemtap.base/finloop2.exp
index 1b253cba..ba31a91e 100644
--- a/testsuite/systemtap.base/finloop2.exp
+++ b/testsuite/systemtap.base/finloop2.exp
@@ -1,8 +1,6 @@
 # Simple function to test that systemtap can generate a kernel module that
 # instruments a function, install it, and get some output.
 
-load_lib "stap_run.exp"
-
 set test "finloop2"
 
 # better have a count other than zero to show that probe fired
diff --git a/testsuite/systemtap.base/global_init.exp b/testsuite/systemtap.base/global_init.exp
index 2076f20f..ae7d143d 100644
--- a/testsuite/systemtap.base/global_init.exp
+++ b/testsuite/systemtap.base/global_init.exp
@@ -1,7 +1,5 @@
 # Check that global variables are initialized before all begin probes
 
-load_lib "stap_run.exp"
-
 set test "global_init"
 
 stap_run $srcdir/$subdir/$test.stp no_load $all_pass_string
diff --git a/testsuite/systemtap.base/if.exp b/testsuite/systemtap.base/if.exp
index 5fbcbf2c..4ffd9e26 100644
--- a/testsuite/systemtap.base/if.exp
+++ b/testsuite/systemtap.base/if.exp
@@ -1,8 +1,6 @@
 # Simple function to test that systemtap can generate a kernel module that
 # instruments a function, install it, and get some output.
 
-load_lib "stap_run.exp"
-
 set test "if"
 
 stap_run $srcdir/$subdir/$test.stp no_load $all_pass_string
diff --git a/testsuite/systemtap.base/inc.exp b/testsuite/systemtap.base/inc.exp
index 977ad4be..a6778117 100644
--- a/testsuite/systemtap.base/inc.exp
+++ b/testsuite/systemtap.base/inc.exp
@@ -1,7 +1,5 @@
 # Simple function to test that systemtap ++ works
 
-load_lib "stap_run.exp"
-
 set test "inc"
 
 stap_run $srcdir/$subdir/$test.stp no_load $all_pass_string
diff --git a/testsuite/systemtap.base/kfunct.exp b/testsuite/systemtap.base/kfunct.exp
index e0a0f709..cb32af28 100644
--- a/testsuite/systemtap.base/kfunct.exp
+++ b/testsuite/systemtap.base/kfunct.exp
@@ -1,8 +1,6 @@
 # Simple function to test that systemtap can generate a kernel module that
 # instruments a function, install it, and get some output.
 
-load_lib "stap_run.exp"
-
 set test "kfunct"
 
 # better have a count other than zero to show that probe fired
diff --git a/testsuite/systemtap.base/kmodule.exp b/testsuite/systemtap.base/kmodule.exp
index 05f464f8..3731711b 100644
--- a/testsuite/systemtap.base/kmodule.exp
+++ b/testsuite/systemtap.base/kmodule.exp
@@ -1,8 +1,6 @@
 # Simple function to test that systemtap can generate instument a module
 # function, install it, and get some output.
 
-load_lib "stap_run.exp"
-
 set test "kmodule"
 
 proc kmodule_load {} {
diff --git a/testsuite/systemtap.base/logical_and.exp b/testsuite/systemtap.base/logical_and.exp
index 5dc86760..026c20be 100644
--- a/testsuite/systemtap.base/logical_and.exp
+++ b/testsuite/systemtap.base/logical_and.exp
@@ -1,7 +1,5 @@
 # Simple function to test that systemtap logial and works
 
-load_lib "stap_run.exp"
-
 set test "logical_and"
 
 stap_run $srcdir/$subdir/$test.stp no_load $all_pass_string
diff --git a/testsuite/systemtap.base/maxactive.exp b/testsuite/systemtap.base/maxactive.exp
index 8754ff6e..db71602b 100644
--- a/testsuite/systemtap.base/maxactive.exp
+++ b/testsuite/systemtap.base/maxactive.exp
@@ -3,12 +3,7 @@
 # Check to see if using the 'maxactive(N)' limit on return probes
 # works, by seeing if skipped probes increases when using it.
 
-load_lib "stap_run.exp"
-
-if {[info procs installtest_p] != "" && ![installtest_p]} {
-    untested "MAXACTIVE"
-    return
-}
+if {![installtest_p]} { untested "MAXACTIVE"; return }
 
 proc sleep_five_sec {} {
     after 5000;
diff --git a/testsuite/systemtap.base/not.exp b/testsuite/systemtap.base/not.exp
index 9898c2e2..17e0b41b 100644
--- a/testsuite/systemtap.base/not.exp
+++ b/testsuite/systemtap.base/not.exp
@@ -1,7 +1,5 @@
 # Simple function to test that systemtap binary not works
 
-load_lib "stap_run.exp"
-
 set test "not"
 
 stap_run $srcdir/$subdir/$test.stp no_load $all_pass_string
diff --git a/testsuite/systemtap.base/probefunc.exp b/testsuite/systemtap.base/probefunc.exp
index b9c02552..1cea688a 100644
--- a/testsuite/systemtap.base/probefunc.exp
+++ b/testsuite/systemtap.base/probefunc.exp
@@ -1,7 +1,5 @@
 # Test cases for probefunc() function
 
-load_lib "stap_run.exp"
-
 proc grep {fd re } {
    while {[gets $fd s] >= 0} {
       if [regexp $re $s] {
diff --git a/testsuite/systemtap.base/simple.exp b/testsuite/systemtap.base/simple.exp
index b22114f9..6f179437 100644
--- a/testsuite/systemtap.base/simple.exp
+++ b/testsuite/systemtap.base/simple.exp
@@ -1,8 +1,6 @@
 # Very simple function to test that systemtap can generate a kernel module,
 # install it, and get some output.
 
-load_lib "stap_run.exp"
-
 set test "simple"
 
 #check to see whether get the marker indicating the probe is loaded and running
diff --git a/testsuite/systemtap.base/timeofday.exp b/testsuite/systemtap.base/timeofday.exp
index 0597b153..811ba380 100644
--- a/testsuite/systemtap.base/timeofday.exp
+++ b/testsuite/systemtap.base/timeofday.exp
@@ -4,8 +4,6 @@
 # from contexts where do_gettimeofday is unsafe (e.g. when xtime_lock is held).
 # See bug #2525 for more details.
 
-load_lib "stap_run.exp"
-
 proc sleep_one_sec {} {
     after 1000;
     return 0;
diff --git a/testsuite/systemtap.base/timers.exp b/testsuite/systemtap.base/timers.exp
index 40870f61..9cca0625 100644
--- a/testsuite/systemtap.base/timers.exp
+++ b/testsuite/systemtap.base/timers.exp
@@ -1,7 +1,5 @@
 # Test the functionality of the various timer.* probes.
 
-load_lib "stap_run.exp"
-
 set test "timers"
 
 # A simple load that give the timers a chance to run
diff --git a/testsuite/systemtap.base/tri.exp b/testsuite/systemtap.base/tri.exp
index 5f418e5b..6b326ea8 100644
--- a/testsuite/systemtap.base/tri.exp
+++ b/testsuite/systemtap.base/tri.exp
@@ -1,7 +1,5 @@
 # Simple function to test that systemtap ?: operation works
 
-load_lib "stap_run.exp"
-
 set test "tri"
 
 stap_run $srcdir/$subdir/$test.stp no_load $all_pass_string