diff options
56 files changed, 16 insertions, 89 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 6dd96c1f..b26c4132 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2007-01-22 Frank Ch. Eigler <fche@redhat.com> + + * config/unix.exp: New file as a master load_lib repository. + * */*.exp: Removed load_lib calls. + * parseko/cmdline01.stp: Swallow expected stap ERROR: message. + * systemtap.syscall/syscall.exp: Added installmode_p checks. + 2007-01-22 Martin Hunt <hunt@redhat.com> * systemtap.maps/exists.stp: New test to see if diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp new file mode 100644 index 00000000..b3be70f5 --- /dev/null +++ b/testsuite/config/unix.exp @@ -0,0 +1,4 @@ +load_lib "systemtap.exp" +load_lib "stap_run2.exp" +load_lib "stap_run_binary.exp" +load_lib "stap_run.exp" diff --git a/testsuite/parseko/cmdline01.stp b/testsuite/parseko/cmdline01.stp index 0f1a21d7..6913f3ca 100755 --- a/testsuite/parseko/cmdline01.stp +++ b/testsuite/parseko/cmdline01.stp @@ -2,4 +2,5 @@ # -M (merge) option is only valid for bulk mode -./stap -p1 -M -e 'probe begin { exit() }' +./stap -p1 -M -e 'probe begin { exit() }' >/dev/null 2>&1 # otherwise, ERROR: message confuses dejagnu +exit $? 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 diff --git a/testsuite/systemtap.maps/exists.exp b/testsuite/systemtap.maps/exists.exp index a223c9ce..ea043a6b 100755 --- a/testsuite/systemtap.maps/exists.exp +++ b/testsuite/systemtap.maps/exists.exp @@ -1,7 +1,5 @@ # test the "in" keyword with maps -load_lib "stap_run2.exp" - set test "exists" set ::result_string {0 is there 1 is there diff --git a/testsuite/systemtap.maps/foreach_foreach.exp b/testsuite/systemtap.maps/foreach_foreach.exp index 7ea5b9cd..f79d290a 100644 --- a/testsuite/systemtap.maps/foreach_foreach.exp +++ b/testsuite/systemtap.maps/foreach_foreach.exp @@ -1,7 +1,5 @@ # Simple test of nested foreaches -load_lib "stap_run2.exp" - set test "foreach_foreach" set ::result_string {foo[0] = 0 diff --git a/testsuite/systemtap.maps/foreach_limit.exp b/testsuite/systemtap.maps/foreach_limit.exp index 1d98a874..bc4e6b9e 100644 --- a/testsuite/systemtap.maps/foreach_limit.exp +++ b/testsuite/systemtap.maps/foreach_limit.exp @@ -1,7 +1,5 @@ # Test of foreach statements using "limit EXP". -load_lib "stap_run2.exp" - set test "foreach_limit" set ::result_string {Arrays: diff --git a/testsuite/systemtap.maps/ii.exp b/testsuite/systemtap.maps/ii.exp index 3b913696..f7ce95fb 100644 --- a/testsuite/systemtap.maps/ii.exp +++ b/testsuite/systemtap.maps/ii.exp @@ -1,7 +1,5 @@ # Simple function to test maps of ints containing ints -load_lib "stap_run2.exp" - set test "ii" set ::result_string {foo[0] = 0 foo[1] = 1 diff --git a/testsuite/systemtap.maps/iiiiii.exp b/testsuite/systemtap.maps/iiiiii.exp index 2d1fae56..3c8dbaf0 100644 --- a/testsuite/systemtap.maps/iiiiii.exp +++ b/testsuite/systemtap.maps/iiiiii.exp @@ -1,7 +1,5 @@ # Simple test of maps with 5 ints as keys, returning ints -load_lib "stap_run2.exp" - set test "iiiiii" set ::result_string {foo[0,0,0,0,0] = 0 foo[0,0,0,0,1] = 1 diff --git a/testsuite/systemtap.maps/is.exp b/testsuite/systemtap.maps/is.exp index b94ad860..5dffb850 100644 --- a/testsuite/systemtap.maps/is.exp +++ b/testsuite/systemtap.maps/is.exp @@ -1,7 +1,5 @@ # Simple function to test maps of ints containing strings -load_lib "stap_run2.exp" - set test "is" set ::result_string {foo[0] = The Result is 0 foo[1] = The Result is 1 diff --git a/testsuite/systemtap.maps/ix.exp b/testsuite/systemtap.maps/ix.exp index 4f587db6..578e8e38 100644 --- a/testsuite/systemtap.maps/ix.exp +++ b/testsuite/systemtap.maps/ix.exp @@ -1,7 +1,5 @@ # Simple function to test maps of ints containing stats -load_lib "stap_run2.exp" - set test "ix" set ::result_string {foo[0]: count:3 sum:98 avg:32 min:-2 max:100 diff --git a/testsuite/systemtap.maps/ix_hist.exp b/testsuite/systemtap.maps/ix_hist.exp index afa5ddf7..85ab0347 100644 --- a/testsuite/systemtap.maps/ix_hist.exp +++ b/testsuite/systemtap.maps/ix_hist.exp @@ -1,7 +1,5 @@ # Simple function to test istograms -load_lib "stap_run2.exp" - set test "ix_hist" set ::result_string {value |-------------------------------------------------- count diff --git a/testsuite/systemtap.maps/si.exp b/testsuite/systemtap.maps/si.exp index c14794bf..600687ed 100644 --- a/testsuite/systemtap.maps/si.exp +++ b/testsuite/systemtap.maps/si.exp @@ -1,7 +1,5 @@ # Simple function to test maps of strings containing ints -load_lib "stap_run2.exp" - set test "si" set ::result_string {foo[0] = 0 foo[1] = 1 diff --git a/testsuite/systemtap.maps/ss.exp b/testsuite/systemtap.maps/ss.exp index f3a32118..548a888e 100644 --- a/testsuite/systemtap.maps/ss.exp +++ b/testsuite/systemtap.maps/ss.exp @@ -1,7 +1,5 @@ # Simple function to test maps of strings containing strings -load_lib "stap_run2.exp" - set test "ss" set ::result_string {foo[0] = The Result is 0 foo[1] = The Result is 1 diff --git a/testsuite/systemtap.printf/basic1.exp b/testsuite/systemtap.printf/basic1.exp index c354a6dc..d124797e 100644 --- a/testsuite/systemtap.printf/basic1.exp +++ b/testsuite/systemtap.printf/basic1.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "basic1" set ::result_string {HelloWorld} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/basic2.exp b/testsuite/systemtap.printf/basic2.exp index 385cc5c5..f03edade 100644 --- a/testsuite/systemtap.printf/basic2.exp +++ b/testsuite/systemtap.printf/basic2.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "basic2" set ::result_string {HelloWorld} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/basic3.exp b/testsuite/systemtap.printf/basic3.exp index 2eb74431..e3beb9ed 100644 --- a/testsuite/systemtap.printf/basic3.exp +++ b/testsuite/systemtap.printf/basic3.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "basic3" set ::result_string {Hello World diff --git a/testsuite/systemtap.printf/basic4.exp b/testsuite/systemtap.printf/basic4.exp index 3b89a24d..9fd46c18 100644 --- a/testsuite/systemtap.printf/basic4.exp +++ b/testsuite/systemtap.printf/basic4.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "basic4" set ::result_string {HelloWorldHelloWorld} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/basic5.exp b/testsuite/systemtap.printf/basic5.exp index 9fe0ad16..87658745 100644 --- a/testsuite/systemtap.printf/basic5.exp +++ b/testsuite/systemtap.printf/basic5.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "basic5" set ::result_string {HelloWorldHelloWorld} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/bin1.exp b/testsuite/systemtap.printf/bin1.exp index e25a6e9c..ff891d6d 100644 --- a/testsuite/systemtap.printf/bin1.exp +++ b/testsuite/systemtap.printf/bin1.exp @@ -1,4 +1,3 @@ -load_lib "stap_run_binary.exp" set test "bin1" set ::result_string {42 } stap_run_binary $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/bin2.exp b/testsuite/systemtap.printf/bin2.exp index bab11e39..4887056b 100644 --- a/testsuite/systemtap.printf/bin2.exp +++ b/testsuite/systemtap.printf/bin2.exp @@ -1,4 +1,3 @@ -load_lib "stap_run_binary.exp" set test "bin2" set ::result_string {12 34 56 78 12 34 56 78 61 3d 12 20 62 3d 34 20 diff --git a/testsuite/systemtap.printf/bin3.exp b/testsuite/systemtap.printf/bin3.exp index e3ffaed5..18b0b4e4 100644 --- a/testsuite/systemtap.printf/bin3.exp +++ b/testsuite/systemtap.printf/bin3.exp @@ -1,4 +1,3 @@ -load_lib "stap_run_binary.exp" set ::result_string {00 12 00 34 ab cd 56 78 56 78 ab cd 88 88 cd ef 61 3d 56 78 20 62 3d ab diff --git a/testsuite/systemtap.printf/bin4.exp b/testsuite/systemtap.printf/bin4.exp index 5da24366..35105a8d 100644 --- a/testsuite/systemtap.printf/bin4.exp +++ b/testsuite/systemtap.printf/bin4.exp @@ -1,4 +1,3 @@ -load_lib "stap_run_binary.exp" set ::result_string {00 00 00 12 00 00 00 34 ab cd ef 00 00 00 56 78 12 34 56 78 11 11 22 22 diff --git a/testsuite/systemtap.printf/bin5.exp b/testsuite/systemtap.printf/bin5.exp index 11564bd5..05069961 100644 --- a/testsuite/systemtap.printf/bin5.exp +++ b/testsuite/systemtap.printf/bin5.exp @@ -1,4 +1,3 @@ -load_lib "stap_run_binary.exp" set ::result_string {00 00 00 00 00 00 00 12 00 00 00 00 00 00 00 34 ab cd 00 00 11 11 22 22 diff --git a/testsuite/systemtap.printf/int1.exp b/testsuite/systemtap.printf/int1.exp index 56fb8e62..bb30b4f3 100644 --- a/testsuite/systemtap.printf/int1.exp +++ b/testsuite/systemtap.printf/int1.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "int1" set ::result_string {1,10,9000000000000,-1,-1024 1,10,9000000000000,-1,-1024 diff --git a/testsuite/systemtap.printf/oct.exp b/testsuite/systemtap.printf/oct.exp index c676ff0e..ced55927 100644 --- a/testsuite/systemtap.printf/oct.exp +++ b/testsuite/systemtap.printf/oct.exp @@ -1,4 +1,3 @@ -load_lib "stap_run_binary.exp" set test "oct" set ::result_string {10 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f diff --git a/testsuite/systemtap.printf/ptr.exp b/testsuite/systemtap.printf/ptr.exp index 0ad0083e..f25a7a02 100644 --- a/testsuite/systemtap.printf/ptr.exp +++ b/testsuite/systemtap.printf/ptr.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "ptr" if {$::tcl_platform(wordSize) == 8} { diff --git a/testsuite/systemtap.printf/string1.exp b/testsuite/systemtap.printf/string1.exp index 7b47336b..aee0b71a 100644 --- a/testsuite/systemtap.printf/string1.exp +++ b/testsuite/systemtap.printf/string1.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "string1" set ::result_string {The string is <Foobar!> Foobar!XYZZY diff --git a/testsuite/systemtap.samples/ioblocktest.exp b/testsuite/systemtap.samples/ioblocktest.exp index e80ec757..b5ab54c7 100644 --- a/testsuite/systemtap.samples/ioblocktest.exp +++ b/testsuite/systemtap.samples/ioblocktest.exp @@ -1,6 +1,5 @@ # Test the functionality of the various ioblock probes. -load_lib "stap_run.exp" set test "ioblocktest" proc sleep_ten_secs {} { diff --git a/testsuite/systemtap.samples/tcptest.exp b/testsuite/systemtap.samples/tcptest.exp index 0ae088ef..23c5301a 100644 --- a/testsuite/systemtap.samples/tcptest.exp +++ b/testsuite/systemtap.samples/tcptest.exp @@ -1,5 +1,4 @@ # Test TCP probes -load_lib "stap_run.exp" set test "tcptest" set tcp_tcl "$srcdir/$subdir/tcptest.tcl" diff --git a/testsuite/systemtap.stress/all_kernel_functions.exp b/testsuite/systemtap.stress/all_kernel_functions.exp index f81b6430..f54f53e1 100644 --- a/testsuite/systemtap.stress/all_kernel_functions.exp +++ b/testsuite/systemtap.stress/all_kernel_functions.exp @@ -1,5 +1,3 @@ -load_lib "stap_run.exp" - proc genload {} { # if 'genload' from the ltp exists, use it to create a real load set genload {/usr/local/ltp/testcases/bin/genload} diff --git a/testsuite/systemtap.stress/current.exp b/testsuite/systemtap.stress/current.exp index 8f4ebff2..840bebbc 100644 --- a/testsuite/systemtap.stress/current.exp +++ b/testsuite/systemtap.stress/current.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 "current" proc current_load {} { diff --git a/testsuite/systemtap.string/isinstr.exp b/testsuite/systemtap.string/isinstr.exp index 746e6c74..986043e8 100644 --- a/testsuite/systemtap.string/isinstr.exp +++ b/testsuite/systemtap.string/isinstr.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "isinstr" set ::result_string {"foo" is in "abcfoobad" "foo" is NOT in "abcdefg" diff --git a/testsuite/systemtap.string/strlen.exp b/testsuite/systemtap.string/strlen.exp index 7fe84ad7..40c790fe 100644 --- a/testsuite/systemtap.string/strlen.exp +++ b/testsuite/systemtap.string/strlen.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "strlen" set ::result_string {strlen("") = 0 strlen("1") = 1 diff --git a/testsuite/systemtap.string/substr.exp b/testsuite/systemtap.string/substr.exp index ee906e5e..c9884935 100644 --- a/testsuite/systemtap.string/substr.exp +++ b/testsuite/systemtap.string/substr.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "substr" set ::result_string {Hello World! 0,0: diff --git a/testsuite/systemtap.string/text_str.exp b/testsuite/systemtap.string/text_str.exp index 2871b2ea..6e9de7fb 100644 --- a/testsuite/systemtap.string/text_str.exp +++ b/testsuite/systemtap.string/text_str.exp @@ -1,4 +1,3 @@ -load_lib "stap_run2.exp" set test "text_str" set ::result_string {a=1234567890 b=12345678901234567890 diff --git a/testsuite/systemtap.syscall/syscall.exp b/testsuite/systemtap.syscall/syscall.exp index 8068a6fc..9a438f06 100644 --- a/testsuite/systemtap.syscall/syscall.exp +++ b/testsuite/systemtap.syscall/syscall.exp @@ -9,6 +9,7 @@ proc test_procedure {} { } foreach filename [lsort [glob $pattern]] { set file [file tail [string range $filename 0 end-2]] + if {![installtest_p]} { untested $file; continue } target_compile $filename $wd/$file executable $flags send_log "Testing ${file}\n" set res [exec $srcdir/$subdir/test.tcl $file $filename] @@ -28,6 +29,7 @@ proc test_procedure {} { set flags "additional_flags=-m32" foreach filename [lsort [glob $pattern]] { set file [file tail [string range $filename 0 end-2]] + if {![installtest_p]} { untested $file; continue } target_compile $filename $wd/$file executable $flags send_log "Testing 32-bit ${file}\n" set res [exec $srcdir/$subdir/test.tcl $file $filename] |