Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

6 files changed, 27 insertions, 9 deletions

diff --git a/testsuite/buildok/ioblock_test.stp b/testsuite/buildok/ioblock_test.stp
index 4d3dadfa..21595021 100755
--- a/testsuite/buildok/ioblock_test.stp
+++ b/testsuite/buildok/ioblock_test.stp
@@ -25,3 +25,10 @@ probe ioblock.end {
                 devname, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments, size, bytes_done, error, ino)
 %)
 }
+
+probe ioblock_trace.*
+{
+  log(pp())
+  printf("%s\t%d\t%d\t%d\t%d\t%s\t%d\t%d\t%d\t%d\t%d\t%d\t%p\t%p\t%d\n",
+                devname, q, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments, size, bytes_done, ino, p_start_sect, bdev_contains, bdev)
+}
diff --git a/testsuite/buildok/ioscheduler.stp b/testsuite/buildok/ioscheduler.stp
index 2d88d2d5..8b377619 100755
--- a/testsuite/buildok/ioscheduler.stp
+++ b/testsuite/buildok/ioscheduler.stp
@@ -7,3 +7,15 @@ probe ioscheduler.*
 	printf("ppname: %s, elv_name: %s, %d, %d", probefunc(), 
 		elevator_name, disk_major, disk_minor)
 }
+
+probe ioscheduler_trace.elv*
+{
+        printf("ppname: %s, request %p, elv_name: %s, %d, %d", probefunc(),
+                rq, elevator_name, disk_major, disk_minor)
+}
+
+probe ioscheduler_trace.plug, ioscheduler_trace.unplug_io, ioscheduler_trace.unplug_timer
+{
+        printf("ppname: %s, request %p", probefunc(), rq_queue)
+}
+
diff --git a/testsuite/buildok/netdev.stp b/testsuite/buildok/netdev.stp
index 49a1eb5c..7e4be82c 100755
--- a/testsuite/buildok/netdev.stp
+++ b/testsuite/buildok/netdev.stp
@@ -1,6 +1,6 @@
 #! stap -wp4
 
-probe netdev.get_stats{
+probe netdev.get_stats ? {
 	printf("%s", dev_name)
 }
 
@@ -21,7 +21,7 @@ probe netdev.set_promiscuity {
 				disable, inc)
 }
 
-probe netdev.change_rx_flag {
+probe netdev.change_rx_flag ? {
 	printf("%s %d", dev_name, flags)
 }
 
diff --git a/testsuite/lib/stap_compile.exp b/testsuite/lib/stap_compile.exp
index c8d44203..8780930e 100644
--- a/testsuite/lib/stap_compile.exp
+++ b/testsuite/lib/stap_compile.exp
@@ -19,8 +19,8 @@ proc stap_compile { TEST_NAME compile script args } {
 	-re "compilation failed" {incr compile_errors 1; exp_continue}
 	-re "semantic error:" {incr compile_errors 1; exp_continue}
     }
-    catch close
     set res [wait -i $spawn_id]
+    catch close
     set res [lindex $res 3]
 
     if {($res == 0 && $compile_errors == 0)
diff --git a/testsuite/systemtap.base/cu-decl.exp b/testsuite/systemtap.base/cu-decl.exp
index 42e683cb..ae06ad85 100644
--- a/testsuite/systemtap.base/cu-decl.exp
+++ b/testsuite/systemtap.base/cu-decl.exp
@@ -17,7 +17,9 @@ if { $res != "" } {
 } else {
     pass "$test target compilation"
 }
-
-stap_compile $test 1 "{$script}"
-
+if {![utrace_p]} {
+    untested "$test : no kernel utrace support found"
+} else {
+    stap_compile $test 1 "{$script}"
+}
 catch {exec rm $test}
diff --git a/testsuite/systemtap.pass1-4/buildok.exp b/testsuite/systemtap.pass1-4/buildok.exp
index 8ab8b139..a9f16a8b 100644
--- a/testsuite/systemtap.pass1-4/buildok.exp
+++ b/testsuite/systemtap.pass1-4/buildok.exp
@@ -6,10 +6,7 @@ foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
     # some tests are known to fail.
     switch $test {
         buildok/perfmon01.stp {setup_kfail 909 *-*-*}
-        buildok/sched_test.stp {setup_kfail 1155 *-*-*}
-        buildok/process_test.stp {setup_kfail 1155 *-*-*}
         buildok/rpc-all-probes.stp {setup_kfail 4413 *-*-*}
-        buildok/nfs-all-probes.stp {setup_kfail 4413 *-*-*}
         buildok/per-process-syscall.stp {if {![utrace_p]} { setup_kfail 9999 *-*-*} }
     }
     if {$rc == 0} { pass $test } else { fail $test }