(PR14574 partial fix) Make the systemtap.maps/*.exp tests use dyninst also.

* testsuite/systemtap.maps/absentstats.exp: Added dyninst testing.
* testsuite/systemtap.maps/elision.exp: Ditto.
* testsuite/systemtap.maps/exists.exp: Ditto.
* testsuite/systemtap.maps/foreach_fail.exp: Ditto.
* testsuite/systemtap.maps/foreach_limit.exp: Ditto.
* testsuite/systemtap.maps/foreach_limit2.exp: Ditto.
* testsuite/systemtap.maps/hist_in_string.exp: Ditto.
* testsuite/systemtap.maps/ii.exp: Ditto.
* testsuite/systemtap.maps/iiiiii.exp: Ditto.
* testsuite/systemtap.maps/is.exp: Ditto.
* testsuite/systemtap.maps/ix.exp: Ditto.
* testsuite/systemtap.maps/ix_clear.exp: Ditto.
* testsuite/systemtap.maps/ix_clear2.exp: Ditto.
* testsuite/systemtap.maps/ix_clear3.exp: Ditto.
* testsuite/systemtap.maps/ix_hist.exp: Ditto.
* testsuite/systemtap.maps/linear.exp: Ditto.
* testsuite/systemtap.maps/linear_0.exp: Ditto.
* testsuite/systemtap.maps/linear_bad.exp: Ditto.
* testsuite/systemtap.maps/linear_empty.exp: Ditto.
* testsuite/systemtap.maps/linear_large.exp: Ditto.
* testsuite/systemtap.maps/linear_large_neg.exp: Ditto.
* testsuite/systemtap.maps/linear_nearlyempty.exp: Ditto.
* testsuite/systemtap.maps/linear_neg.exp: Ditto.
* testsuite/systemtap.maps/linear_over.exp: Ditto.
* testsuite/systemtap.maps/linear_overunder.exp: Ditto.
* testsuite/systemtap.maps/linear_under.exp: Ditto.
* testsuite/systemtap.maps/log.exp: Ditto.
* testsuite/systemtap.maps/log_edge.exp: Ditto.
* testsuite/systemtap.maps/map_hash.exp: Ditto.
* testsuite/systemtap.maps/map_wrap.exp: Ditto.
* testsuite/systemtap.pass1-4/debugtypes.exp: Ditto.

diff --git a/testsuite/systemtap.maps/absentstats.exp b/testsuite/systemtap.maps/absentstats.exp
index ab9cd7221b1ffacf9bcb8040ab2484d603f66145..212429e1e27038c5449dc67c80fccd452a1dce95 100644 (file)
--- a/testsuite/systemtap.maps/absentstats.exp
+++ b/testsuite/systemtap.maps/absentstats.exp
@@ -1,44 +1,62 @@
 # PR 2142+2610
 
 set test "absentstats"
+set script $srcdir/$subdir/$test.stp
 
 if {![installtest_p]} { untested $test; return }
 
-set ok 0
-set ko 0
-
-spawn stap -DMAXERRORS=20 $srcdir/$subdir/$test.stp
-# spawn echo hello children 0
-expect {
-  -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 }
-  -re {\n} { exp_continue }
-  eof { }
+foreach runtime [get_runtime_list] {
+    set ok 0
+    set ko 0
+
+    set testname $test
+    if {$runtime != ""} {
+       spawn stap -DMAXERRORS=20 --runtime=$runtime $script
+       lappend testname "($runtime)"
+    } else {
+       spawn stap -DMAXERRORS=20 $script
+    }    
+    expect {
+       -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 }
+       -re {\n} { exp_continue }
+       eof { }
+    }
+    catch close
+    wait
+    
+    # As of stap 1.5, @count and @sum are allowed, the rest fail
+    if {$ok == 4 && $ko == 11} {
+       pass $testname
+    } else {
+       fail "$testname ($ok $ko)"
+    }
+    
+    set ok 0
+    set ko 0
+    
+    if {$runtime != ""} {
+       spawn stap -DMAXERRORS=20 --runtime=$runtime $script --compatible=1.4
+    } else {
+       spawn stap -DMAXERRORS=20 $script --compatible=1.4
+    }    
+    expect {
+       -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 }
+       -re {\n} { exp_continue }
+       eof { }
+    }
+    catch close
+    wait
+    
+    # In stap <= 1.4, only @count is allowed, the rest fail
+    if {$ok == 2 && $ko == 13} {
+       pass "$testname 1.4"
+    } else {
+       fail "$testname 1.4 ($ok $ko)"
+    }
 }
-catch close
-wait
-
-# As of stap 1.5, @count and @sum are allowed, the rest fail
-if {$ok == 4 && $ko == 11} then { pass $test } else { fail "$test ($ok $ko)" }
-
-
-set ok 0
-set ko 0
-
-spawn stap -DMAXERRORS=20 $srcdir/$subdir/$test.stp --compatible=1.4
-# spawn echo hello children 0
-expect {
-  -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 }
-  -re {\n} { exp_continue }
-  eof { }
-}
-catch close
-wait
-
-# In stap <= 1.4, only @count is allowed, the rest fail
-if {$ok == 2 && $ko == 13} then { pass "$test 1.4" } else { fail "$test 1.4 ($ok $ko)" }

diff --git a/testsuite/systemtap.maps/elision.exp b/testsuite/systemtap.maps/elision.exp
index 60c52bbe5cce9650d2b34a879f7822dfaadbc198..6c238a88f8ac7aaed238a815ae0d7b62d422da2c 100644 (file)
--- a/testsuite/systemtap.maps/elision.exp
+++ b/testsuite/systemtap.maps/elision.exp
@@ -388,10 +388,17 @@ value |-------------------------------------------------- count
 }
 
 
-for {set i -1} { $i < 4} {incr i} {
-    set test "elision-$i"
-    set ::result_string $myresults($i)
-    stap_run_exact "elision$i" $srcdir/$subdir/elision.stp -DHIST_ELISION=$i
+set script $srcdir/$subdir/elision.stp
+foreach runtime [get_runtime_list] {
+    for {set i -1} { $i < 4} {incr i} {
+       set test "elision$i"
+       set ::result_string $myresults($i)
+
+       if {$runtime != ""} {
+           lappend test "($runtime)"
+           stap_run_exact $test $script -DHIST_ELISION=$i --runtime=$runtime
+       } else {
+           stap_run_exact $test $script -DHIST_ELISION=$i
+       }
+    }
 }
-
-

diff --git a/testsuite/systemtap.maps/exists.exp b/testsuite/systemtap.maps/exists.exp
index bbdac737c5caf2075f67d70a0eef651c8b6ca62b..3e96b08e4a8ad97afbddc7ff0e28bef51a04169f 100644 (file)
--- a/testsuite/systemtap.maps/exists.exp
+++ b/testsuite/systemtap.maps/exists.exp
@@ -11,6 +11,10 @@ emtpy string there
 hello there
 emtpy string still there}
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/foreach_fail.exp b/testsuite/systemtap.maps/foreach_fail.exp
index 75fcfcc4d20550305a5eae3ff9aee54cf5d1397d..f1d3593bd8fe46cdcf1ccb53caf169208356a4fd 100644 (file)
--- a/testsuite/systemtap.maps/foreach_fail.exp
+++ b/testsuite/systemtap.maps/foreach_fail.exp
@@ -5,14 +5,22 @@
 set test foreach_fail
 if {![installtest_p]} { untested $test; return }
 
-spawn stap  $srcdir/$subdir/$test.stp
-expect {
-  -timeout 60
-  timeout { 
-    fail "$test timed out" }
-  eof { 
-    fail "$test unexpected EOF" }
-  -re "semantic error:" { pass "$test correctly failed to compile" }
+foreach runtime [get_runtime_list] {
+    set testname $test
+    if {$runtime != ""} {
+       spawn stap --runtime=$runtime $srcdir/$subdir/$test.stp
+       lappend testname "($runtime)"
+    } else {
+       spawn stap $srcdir/$subdir/$test.stp
+    }
+    expect {
+       -timeout 60
+       timeout { 
+           fail "$testname timed out" }
+       eof { 
+           fail "$testname unexpected EOF" }
+       -re "semantic error:" { pass "$testname correctly failed to compile" }
+    }
+    close
+    wait
 }
-close
-wait

diff --git a/testsuite/systemtap.maps/foreach_limit.exp b/testsuite/systemtap.maps/foreach_limit.exp
index 4cc87ec8ac285613f60a5aae58855eb89c16caf5..d460cecddf4f67496a020ba0432de66132947e27 100644 (file)
--- a/testsuite/systemtap.maps/foreach_limit.exp
+++ b/testsuite/systemtap.maps/foreach_limit.exp
@@ -96,6 +96,10 @@ loop had 71 iterations
 
 Done.}
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/foreach_limit2.exp b/testsuite/systemtap.maps/foreach_limit2.exp
index 7988355c5f25c04f130dfe81a965648482709590..7d02e634755c928c4cbfaaf467d2605e9abec97f 100644 (file)
--- a/testsuite/systemtap.maps/foreach_limit2.exp
+++ b/testsuite/systemtap.maps/foreach_limit2.exp
@@ -84,6 +84,10 @@ x ended up as 5
 
 Done.}
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/hist_in_string.exp b/testsuite/systemtap.maps/hist_in_string.exp
index 02f201afdbc7684d1b73211a39005cf07d2b2e31..160338f781ac7277c9bbcd66e671ee0db0beb1d5 100644 (file)
--- a/testsuite/systemtap.maps/hist_in_string.exp
+++ b/testsuite/systemtap.maps/hist_in_string.exp
@@ -5,4 +5,10 @@ set ::result_string {value |-------------------------------------------------- c
     0 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@         128
 }
 
-stap_run2 $srcdir/$subdir/$test.stp
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/ii.exp b/testsuite/systemtap.maps/ii.exp
index 1f4a972a2e487744fa8068577e2ebb30e48f0dbd..e32cd93ad5027e3dbbdb14b9f28df2325137b857 100644 (file)
--- a/testsuite/systemtap.maps/ii.exp
+++ b/testsuite/systemtap.maps/ii.exp
@@ -63,6 +63,10 @@ foo[8] = 204
 foo[9] = 285
 foo[10] = 385}
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/iiiiii.exp b/testsuite/systemtap.maps/iiiiii.exp
index aeddbbacb0c838c6b6bd89947e893ab882c4c959..a057250ecc08a15c92f317b392ec21ab466c0a1e 100644 (file)
--- a/testsuite/systemtap.maps/iiiiii.exp
+++ b/testsuite/systemtap.maps/iiiiii.exp
@@ -66,6 +66,10 @@ foo[1,1,1,0,1] = 4
 foo[1,1,1,1,0] = 4
 foo[1,1,1,1,1] = 5}
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/is.exp b/testsuite/systemtap.maps/is.exp
index 31e96e7764024a56b8ce1c905cfcd62568da3cfb..ea61068dc8eef16dbe810ec9ed10deb84e41482e 100644 (file)
--- a/testsuite/systemtap.maps/is.exp
+++ b/testsuite/systemtap.maps/is.exp
@@ -63,6 +63,10 @@ foo[8] = # 64
 foo[9] = # 81
 foo[10] = # 100}
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/ix.exp b/testsuite/systemtap.maps/ix.exp
index 11de73c178b1c4ae742ee29b69df063c9ee08436..fdd6e8d464509e8cf433236cbbf4beb22585605c 100644 (file)
--- a/testsuite/systemtap.maps/ix.exp
+++ b/testsuite/systemtap.maps/ix.exp
@@ -43,6 +43,10 @@ foo[10]: count:4  sum:118  avg:29  min:-2  max:100
 Run a quick foreach without sorting...
 complete sum of foo:1243}
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/ix_clear.exp b/testsuite/systemtap.maps/ix_clear.exp
index 074178980bc56e99320f800fbd66b265eb212da2..ab66d94adf9b2a808729fba98e5e7f683a1f1f9d 100644 (file)
--- a/testsuite/systemtap.maps/ix_clear.exp
+++ b/testsuite/systemtap.maps/ix_clear.exp
@@ -5,21 +5,28 @@ if {![installtest_p]} { untested $test; return }
 
 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 { 
-    exec kill -INT -[exp_pid]
-    fail "$test timed out"
-  }
-  eof { 
-    fail "$test unexpected EOF" }
-  -re "semantic error:" { fail "$test compilation" }
+foreach runtime [get_runtime_list] {
+    # spawn test
+    set testname $test
+    if {$runtime != ""} {
+       spawn stap --runtime=$runtime $srcdir/$subdir/$test.stp
+       lappend testname "($runtime)"
+    } else {
+       spawn stap $srcdir/$subdir/$test.stp
+    }
+    expect {
+       -timeout 150
+       $pass_result {
+           pass "$testname passed"
+       }
+       timeout { 
+           exec kill -INT -[exp_pid]
+           fail "$testname timed out"
+       }
+       eof { 
+           fail "$testname unexpected EOF" }
+       -re "semantic error:" { fail "$testname compilation" }
+    }
+    catch { close }
+    wait
 }
-catch { close }
-wait

diff --git a/testsuite/systemtap.maps/ix_clear2.exp b/testsuite/systemtap.maps/ix_clear2.exp
index a1b68628c8b69c11caa780aaef1b179d46137865..2679483b3b0caea6540480b4c9cdc2ef53035d20 100644 (file)
--- a/testsuite/systemtap.maps/ix_clear2.exp
+++ b/testsuite/systemtap.maps/ix_clear2.exp
@@ -7,20 +7,28 @@ if {![installtest_p]} { untested $test; return }
 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 {
-    exec kill -INT -[exp_pid]
-    fail "$test timed out"
-  }
-  eof { 
-    fail "$test unexpected EOF" }
-  -re "semantic error:" { fail "$test compilation" }
+foreach runtime [get_runtime_list] {
+    # spawn test
+    set testname $test
+    if {$runtime != ""} {
+       spawn stap --runtime=$runtime $srcdir/$subdir/$test.stp
+       lappend testname "($runtime)"
+    } else {
+       spawn stap $srcdir/$subdir/$test.stp
+    }
+    expect {
+       -timeout 150
+       $pass_result {
+           pass "$testname passed"
+       }
+       timeout {
+           exec kill -INT -[exp_pid]
+           fail "$testname timed out"
+       }
+       eof { 
+           fail "$testname unexpected EOF" }
+       -re "semantic error:" { fail "$testname compilation" }
+    }
+    catch { close }
+    wait
 }
-catch { close }
-wait

diff --git a/testsuite/systemtap.maps/ix_clear3.exp b/testsuite/systemtap.maps/ix_clear3.exp
index a29354708bf72de18fcd75de599e3f20ecfc7f55..cb51da86a9236333bf2a035b6c1a6cd6fe413d06 100644 (file)
--- a/testsuite/systemtap.maps/ix_clear3.exp
+++ b/testsuite/systemtap.maps/ix_clear3.exp
@@ -5,20 +5,28 @@ if {![installtest_p]} { untested $test; return }
 
 set pass_result {*ERROR: empty aggregate*}
 
-# spawn test
-spawn stap $srcdir/$subdir/$test.stp
-expect {
-  -timeout 150
-  $pass_result {
-    pass "$test passed"
-  }
-  timeout {
-    exec kill -INT -[exp_pid]
-    fail "$test timed out"
-  }
-  eof { 
-    fail "$test unexpected EOF" }
-  -re "semantic error:" { fail "$test compilation" }
+foreach runtime [get_runtime_list] {
+    # spawn test
+    set testname $test
+    if {$runtime != ""} {
+       spawn stap --runtime=$runtime $srcdir/$subdir/$test.stp
+       lappend testname "($runtime)"
+    } else {
+       spawn stap $srcdir/$subdir/$test.stp
+    }
+    expect {
+       -timeout 150
+       $pass_result {
+           pass "$testname passed"
+       }
+       timeout {
+           exec kill -INT -[exp_pid]
+           fail "$testname timed out"
+       }
+       eof { 
+           fail "$testname unexpected EOF" }
+       -re "semantic error:" { fail "$testname compilation" }
+    }
+    catch { close }
+    wait
 }
-catch { close }
-wait

diff --git a/testsuite/systemtap.maps/ix_hist.exp b/testsuite/systemtap.maps/ix_hist.exp
index 85ab034721160805c6d3539efb352380a1c981b8..cc331ee46d5ca5ce478895162713ccd0b0e59ef2 100644 (file)
--- a/testsuite/systemtap.maps/ix_hist.exp
+++ b/testsuite/systemtap.maps/ix_hist.exp
@@ -61,6 +61,10 @@ value |-------------------------------------------------- count
  4096 |                                                     0
 }
 
-stap_run2 $srcdir/$subdir/$test.stp -DMAXACTION=10000
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime -DMAXACTION=10000
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp -DMAXACTION=10000
+    }
+}

diff --git a/testsuite/systemtap.maps/linear.exp b/testsuite/systemtap.maps/linear.exp
index 23b5f871ec6d5231b27fbb07ec3a22cf71b92ab5..45759553b5504511659f6c71c5b7cf598880993c 100644 (file)
--- a/testsuite/systemtap.maps/linear.exp
+++ b/testsuite/systemtap.maps/linear.exp
@@ -40,6 +40,10 @@ value |-------------------------------------------------- count
  1500 |                                                     0
 }
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/linear_0.exp b/testsuite/systemtap.maps/linear_0.exp
index 8e6952a75f846ebcd5e792e91c58af1a04fe5ddc..18755a7a87967ebbd2846bd17f0ed0843d0a9539 100644 (file)
--- a/testsuite/systemtap.maps/linear_0.exp
+++ b/testsuite/systemtap.maps/linear_0.exp
@@ -4,22 +4,30 @@ set test "linear_0"
 
 if {![installtest_p]} { untested $test; return }
 
-set ok 0
-
-spawn stap -DMAXACTION=10000 $srcdir/$subdir/$test.stp
-expect {
-    -timeout 150
-    "WARNING: histogram: interval cannot be zero." { 
-       incr ok
-       exp_continue
+set script $srcdir/$subdir/$test.stp
+foreach runtime [get_runtime_list] {
+    set ok 0
+    set testname $test
+    if {$runtime != ""} {
+       spawn stap -DMAXACTION=10000 --runtime=$runtime $script
+       lappend testname "($runtime)"
+    } else {
+       spawn stap -DMAXACTION=10000 $script
     }
-    eof { }
-}
-catch close
-wait
+    expect {
+       -timeout 150
+       "WARNING: histogram: interval cannot be zero." { 
+           incr ok
+           exp_continue
+       }
+       eof { }
+    }
+    catch close
+    wait
 
-if {$ok == 1} { 
-    pass $test 
-} else { 
-    fail $test 
+    if {$ok == 1} { 
+       pass $testname
+    } else { 
+       fail $testname
+    }
 }

diff --git a/testsuite/systemtap.maps/linear_bad.exp b/testsuite/systemtap.maps/linear_bad.exp
index d99fd16c698def047038ad1bc618e6ed646554cf..96a0960bda38de4a463e7771cdcac9368da6b66a 100644 (file)
--- a/testsuite/systemtap.maps/linear_bad.exp
+++ b/testsuite/systemtap.maps/linear_bad.exp
@@ -4,22 +4,31 @@ set test "linear_bad"
 
 if {![installtest_p]} { untested $test; return }
 
-set ok 0
+set script $srcdir/$subdir/$test.stp
+foreach runtime [get_runtime_list] {
+    set ok 0
+    set testname $test
+    if {$runtime != ""} {
+       spawn stap -DMAXACTION=10000 --runtime=$runtime $script
+       lappend testname "($runtime)"
+    } else {
+       spawn stap -DMAXACTION=10000 $script
+    }
 
-spawn stap -DMAXACTION=10000 $srcdir/$subdir/$test.stp
-expect {
-    -timeout 150
-    "WARNING: histogram: Number of buckets" {
-       incr ok
-       exp_continue
+    expect {
+       -timeout 150
+       "WARNING: histogram: Number of buckets" {
+           incr ok
+           exp_continue
+       }
+       eof { }
     }
-    eof { }
-}
-catch close
-wait
+    catch close
+    wait
 
-if {$ok == 1} { 
-    pass $test 
-} else { 
-    fail $test 
+    if {$ok == 1} { 
+       pass $testname
+    } else { 
+       fail $testname
+    }
 }

diff --git a/testsuite/systemtap.maps/linear_empty.exp b/testsuite/systemtap.maps/linear_empty.exp
index 922ff0b950cdf52af1bd115c02ef427abf0bd288..0c21a01ab07477d7f0069ae27deb3138f9684714 100644 (file)
--- a/testsuite/systemtap.maps/linear_empty.exp
+++ b/testsuite/systemtap.maps/linear_empty.exp
@@ -3,5 +3,11 @@
 set test "linear_empty"
 set ::result_string {count=0}
 
-stap_run2 $srcdir/$subdir/$test.stp -w
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp -w --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp -w
+    }
+}
 

diff --git a/testsuite/systemtap.maps/linear_large.exp b/testsuite/systemtap.maps/linear_large.exp
index d2a03f0a5d2dfd06143d54355a7cce7a76d4374a..4da24715c73a30fabc1457f1bbf0f79ade84970b 100644 (file)
--- a/testsuite/systemtap.maps/linear_large.exp
+++ b/testsuite/systemtap.maps/linear_large.exp
@@ -21,6 +21,10 @@ avg=1115333333
 >1000000000 |@                                                  1
 }
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/linear_large_neg.exp b/testsuite/systemtap.maps/linear_large_neg.exp
index 470414a31f18417d966ac6990dbd0e72fa3b9123..66fc897efdbe284a5acf31effc2c12becd2a5c33 100644 (file)
--- a/testsuite/systemtap.maps/linear_large_neg.exp
+++ b/testsuite/systemtap.maps/linear_large_neg.exp
@@ -21,6 +21,10 @@ avg=-1284615384
            0 |@                                                  1
 }
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/linear_nearlyempty.exp b/testsuite/systemtap.maps/linear_nearlyempty.exp
index dfb5e9ef3c2b9df5f27a285b7e95939b09344c5d..4266f68e05d7d5d562bcf0c0943c55e5746eda78 100644 (file)
--- a/testsuite/systemtap.maps/linear_nearlyempty.exp
+++ b/testsuite/systemtap.maps/linear_nearlyempty.exp
@@ -20,6 +20,10 @@ value |-------------------------------------------------- count
  1050 |                                                   0
 }
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/linear_neg.exp b/testsuite/systemtap.maps/linear_neg.exp
index b1640030831e7728d261294c6115f6236882cf39..4bc6d6e18ad88c02caa0a667d2032d5902bcc2fb 100644 (file)
--- a/testsuite/systemtap.maps/linear_neg.exp
+++ b/testsuite/systemtap.maps/linear_neg.exp
@@ -4,22 +4,30 @@ set test "linear_neg"
 
 if {![installtest_p]} { untested $test; return }
 
-set ok 0
-
-spawn stap -DMAXACTION=10000 $srcdir/$subdir/$test.stp
-expect {
-    -timeout 150
-   "Number of buckets" {
-       incr ok
-       exp_continue
+set script $srcdir/$subdir/$test.stp
+foreach runtime [get_runtime_list] {
+    set ok 0
+    set testname $test
+    if {$runtime != ""} {
+       spawn stap -DMAXACTION=10000 --runtime=$runtime $script
+       lappend testname "($runtime)"
+    } else {
+       spawn stap -DMAXACTION=10000 $script
     }
-    eof { }
-}
-catch close
-wait
+    expect {
+       -timeout 150
+       "Number of buckets" {
+           incr ok
+           exp_continue
+       }
+       eof { }
+    }
+    catch close
+    wait
 
-if {$ok == 1} { 
-    pass $test 
-} else { 
-    fail $test 
+    if {$ok == 1} { 
+       pass $testname
+    } else { 
+       fail $testname
+    }
 }

diff --git a/testsuite/systemtap.maps/linear_over.exp b/testsuite/systemtap.maps/linear_over.exp
index 25eca1e11009c2f5c2c37a7eaa9b53e7d1d9428a..ffc0d7c283f7bd73a5b69f23b1776377b43395ed 100644 (file)
--- a/testsuite/systemtap.maps/linear_over.exp
+++ b/testsuite/systemtap.maps/linear_over.exp
@@ -12,6 +12,10 @@ value |-------------------------------------------------- count
  >100 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 9000
 }
 
-stap_run2 $srcdir/$subdir/$test.stp -DMAXACTION=10000
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime -DMAXACTION=10000
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp -DMAXACTION=10000
+    }
+}

diff --git a/testsuite/systemtap.maps/linear_overunder.exp b/testsuite/systemtap.maps/linear_overunder.exp
index e52755249d5082202b78598590e32aee4907e3de..c0a79996dc38171f4f46d520e413b7f2f62df8bb 100644 (file)
--- a/testsuite/systemtap.maps/linear_overunder.exp
+++ b/testsuite/systemtap.maps/linear_overunder.exp
@@ -27,6 +27,10 @@ value |-------------------------------------------------- count
 >1000 |@@@@@@@                                            102
 }
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/linear_under.exp b/testsuite/systemtap.maps/linear_under.exp
index 28d248864cded446058b1716f2f8f95ac28c6971..80b26789166e5766840591c5fe105a88132da619 100644 (file)
--- a/testsuite/systemtap.maps/linear_under.exp
+++ b/testsuite/systemtap.maps/linear_under.exp
@@ -12,6 +12,10 @@ value |-------------------------------------------------- count
  1900 |                                                     0
 }
 
-stap_run2 $srcdir/$subdir/$test.stp -DMAXACTION=10000
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime -DMAXACTION=10000
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp -DMAXACTION=10000
+    }
+}

diff --git a/testsuite/systemtap.maps/log.exp b/testsuite/systemtap.maps/log.exp
index d19082b40186a0d3298f2130d17b57659b3292de..832d77d787bbeaeca399bcd270cbd8c4ac4baf8b 100644 (file)
--- a/testsuite/systemtap.maps/log.exp
+++ b/testsuite/systemtap.maps/log.exp
@@ -132,6 +132,10 @@ set ::result_string {               value |-------------------------------------
  4611686018427387904 |@                                                   1
 }
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/log_edge.exp b/testsuite/systemtap.maps/log_edge.exp
index 6ce546d9ae4cb623f46bfc3dafa30247ed2ac5f7..3ec655bde8a8584b723a21885f8e871cb47f2b0d 100644 (file)
--- a/testsuite/systemtap.maps/log_edge.exp
+++ b/testsuite/systemtap.maps/log_edge.exp
@@ -45,6 +45,10 @@ bucket 65: 1
 bucket 66: 2
 bucket 67: 1}
 
-stap_run2 $srcdir/$subdir/$test.stp
-
-
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test.stp --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test.stp
+    }
+}

diff --git a/testsuite/systemtap.maps/map_hash.exp b/testsuite/systemtap.maps/map_hash.exp
index abc29436ac9c9c1baf07189410bab3ca1bdc90c6..148929d65ec561b435f0dc4702182cf47456634e 100644 (file)
--- a/testsuite/systemtap.maps/map_hash.exp
+++ b/testsuite/systemtap.maps/map_hash.exp
@@ -2050,7 +2050,14 @@ array[4]=0x1
 array[3]=0x1
 array[2]=0x1
 array[1]=0x1}
-stap_run2 $srcdir/$subdir/$test
+
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test
+    }
+}
 
 #SI Regular Map Test
 set test "map_hash_SI.stp"
@@ -4102,7 +4109,14 @@ array["start-pulseaudio-x11"]=0x1
 array["startx"]=0x1
 array["stat"]=0x1
 array["stdbuf"]=0x1}
-stap_run2 $srcdir/$subdir/$test
+
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test
+    }
+}
 
 #SSI Regular Map Test
 set test "map_hash_SSI.stp"
@@ -6154,7 +6168,14 @@ array["start-pulseaudio-x11","start-pulseaudio-x11"]=0x1
 array["startx","startx"]=0x1
 array["stat","stat"]=0x1
 array["stdbuf","stdbuf"]=0x1}
-stap_run2 $srcdir/$subdir/$test
+
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test
+    }
+}
 
 #II Statistics Map Test
 set test "map_hash_stat_II.stp"
@@ -8206,7 +8227,14 @@ array[2045]: count:1  sum:1  avg:1  min:1  max:1
 array[2046]: count:1  sum:1  avg:1  min:1  max:1
 array[2047]: count:1  sum:1  avg:1  min:1  max:1
 array[2048]: count:1  sum:1  avg:1  min:1  max:1}
-stap_run2 $srcdir/$subdir/$test
+
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test
+    }
+}
 
 #SI Statistics Map Test
 set test "map_hash_stat_SI.stp"
@@ -10258,7 +10286,14 @@ array["start-pulseaudio-x11"]: count:1  sum:1  avg:1  min:1  max:1
 array["startx"]: count:1  sum:1  avg:1  min:1  max:1
 array["stat"]: count:1  sum:1  avg:1  min:1  max:1
 array["stdbuf"]: count:1  sum:1  avg:1  min:1  max:1}
-stap_run2 $srcdir/$subdir/$test
+
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test
+    }
+}
 
 #SSI Statistics Map Test
 set test "map_hash_stat_SSI.stp"
@@ -12310,4 +12345,11 @@ array["start-pulseaudio-x11", "start-pulseaudio-x11"]: count:1  sum:1  avg:1  mi
 array["startx", "startx"]: count:1  sum:1  avg:1  min:1  max:1
 array["stat", "stat"]: count:1  sum:1  avg:1  min:1  max:1
 array["stdbuf", "stdbuf"]: count:1  sum:1  avg:1  min:1  max:1}
-stap_run2 $srcdir/$subdir/$test
+
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test
+    }
+}

diff --git a/testsuite/systemtap.maps/map_wrap.exp b/testsuite/systemtap.maps/map_wrap.exp
index 55776d36f3897593db59f96d2e2926b61196d239..846990f5cb57fb0d416d6e63adc5eb7eada2d09f 100644 (file)
--- a/testsuite/systemtap.maps/map_wrap.exp
+++ b/testsuite/systemtap.maps/map_wrap.exp
@@ -5,7 +5,14 @@ foo[8]=0x8
 foo[7]=0x7
 foo[6]=0x6
 foo[5]=0x5}
-stap_run2 $srcdir/$subdir/$test
+
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test
+    }
+}
 
 # Statistics Valued Array Test
 set test "map_wrap2.stp"
@@ -14,5 +21,11 @@ foo[6]: count:1  sum:6  avg:6  min:6  max:6
 foo[7]: count:1  sum:7  avg:7  min:7  max:7
 foo[8]: count:1  sum:8  avg:8  min:8  max:8
 foo[9]: count:1  sum:9  avg:9  min:9  max:9}
-stap_run2 $srcdir/$subdir/$test
 
+foreach runtime [get_runtime_list] {
+    if {$runtime != ""} {
+       stap_run2 $srcdir/$subdir/$test --runtime=$runtime
+    } else {
+       stap_run2 $srcdir/$subdir/$test
+    }
+}

diff --git a/testsuite/systemtap.pass1-4/debugtypes.exp b/testsuite/systemtap.pass1-4/debugtypes.exp
index f571a4dae99a9e9e1f61ac029b68bcbeccea6083..b1e8ef9658690e99d33d295ad8355457b53a4de1 100644 (file)
--- a/testsuite/systemtap.pass1-4/debugtypes.exp
+++ b/testsuite/systemtap.pass1-4/debugtypes.exp
@@ -7,8 +7,14 @@ if {[target_compile $srcdir/$subdir/$test.cxx $test.exe executable \
 }
 pass "compiling $test.cxx"
 
-if {[stap_run_batch $srcdir/$subdir/$test.stp] == 0} {
-  pass "compiling $test.stp"
-} else {
-  fail "compiling $test.stp"
+foreach runtime [get_runtime_list] {
+    set testname "compiling $test.stp"
+    if {$runtime != ""} {
+       set rc [stap_run_batch $srcdir/$subdir/$test.stp --runtime=$runtime]
+       lappend testname "($runtime)"
+    } else {
+       set rc [stap_run_batch $srcdir/$subdir/$test.stp]
+    }
+
+    if {$rc == 0} { pass $testname } else { fail $testname }
 }