6 files changed, 10 insertions, 8 deletions
diff --git a/testsuite/buildok/ioscheduler.stp b/testsuite/buildok/ioscheduler.stp
index 7a39c455..2d88d2d5 100755
--- a/testsuite/buildok/ioscheduler.stp
+++ b/testsuite/buildok/ioscheduler.stp
@@ -1,4 +1,6 @@
-#! stap -p4
+#! stap -wp4
+
+# PR6538: "-w" is above since disk_major/disk_minor are not defined by all aliases.
 
 probe ioscheduler.*
 {
diff --git a/testsuite/buildok/nine.stp b/testsuite/buildok/nine.stp
index d9a15276..a0ca1d40 100755
--- a/testsuite/buildok/nine.stp
+++ b/testsuite/buildok/nine.stp
@@ -4,5 +4,5 @@ function f () { }
 function g (arg) { }
 
 probe begin {
-  true ? f() : g(1);
+  (true=1) ? f() : g(1);
 }
diff --git a/testsuite/buildok/scsi.stp b/testsuite/buildok/scsi.stp
index 6f60de2f..dfe855de 100755
--- a/testsuite/buildok/scsi.stp
+++ b/testsuite/buildok/scsi.stp
@@ -23,7 +23,7 @@ probe scsi.iodispatching
 {
 	printf("ppname: %s, %d, %d, %d, %d, %d, %d, %p, %d\n", probefunc(), 
 		host_no, channel, lun, dev_id, device_state, data_direction, 
-		request_buffer, req_bufflen)
+		request_buffer, request_bufflen)
 }
 
 
diff --git a/testsuite/buildok/sixteen.stp b/testsuite/buildok/sixteen.stp
index 0e313fa8..97721a2d 100755
--- a/testsuite/buildok/sixteen.stp
+++ b/testsuite/buildok/sixteen.stp
@@ -3,7 +3,7 @@
 global a
 
 function foo () {
-  if (a[k] == "sayonara") { return 2 }
+  if (a[4] == "sayonara") { return 2 }
 }
 
 
diff --git a/testsuite/buildok/socket.stp b/testsuite/buildok/socket.stp
index 4b9142a9..5ada4018 100755
--- a/testsuite/buildok/socket.stp
+++ b/testsuite/buildok/socket.stp
@@ -1,4 +1,4 @@
-#! stap -p4
+#! stap -wp4
 
 probe socket.send, socket.receive,
       socket.sendmsg, socket.sendmsg.return,
@@ -33,7 +33,7 @@ probe socket.send, socket.receive,
 	typ = sock_type_str2num(tstr)
 	log(sprintf("%d, %d, %s", type, typ, tstr))
 
-	log(sprintf("%d", success))
+	log(sprintf("%d", success))  # -w since success is not universally defined
 }
 
 
diff --git a/testsuite/buildok/stat_insert.stp b/testsuite/buildok/stat_insert.stp
index 4039a190..7d7eb98e 100755
--- a/testsuite/buildok/stat_insert.stp
+++ b/testsuite/buildok/stat_insert.stp
@@ -15,8 +15,8 @@ function wibble()
 	i = 0
 	logmap[i++, "stewed"] <<< 1
 	logmap[i++, "boiled"] <<< 1 + 2
-	logmap[i++, "baked"] <<< x
-	logmap[i++, "fried"] <<< (x * y) + 3
+	logmap[i++, "baked"] <<< (x = 0)
+	logmap[i++, "fried"] <<< (x * (y=2)) + 3
 }
 
 function wobble()