PR6538: more testsuite tweaks for read-only warnings

11 files changed, 21 insertions, 13 deletions

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 9396fe18..ca0afebd 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-21  Frank Ch. Eigler  <fche@elastic.org>
+
+	PR 6538
+	* buildok/ioscheduler.stp, nine.stp, scsi.stp, sixteen.stp,
+	socket.stp, stat_insert.stp: Adapt to new warnings.
+	* systemtap.maps/linear_empty.exp, systemtap.samples/args.exp,
+	systemtap.samples/poll_map.stp, systemtap.string/strtol.stp: Ditto.
+
 2008-05-20  Frank Ch. Eigler  <fche@elastic.org>
 
 	PR 6538
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()
diff --git a/testsuite/systemtap.maps/linear_empty.exp b/testsuite/systemtap.maps/linear_empty.exp
index 9bcc64eb..88a53a31 100644
--- a/testsuite/systemtap.maps/linear_empty.exp
+++ b/testsuite/systemtap.maps/linear_empty.exp
@@ -4,6 +4,5 @@ set test "linear_empty"
 set ::result_string {count=0
 }
 
-stap_run2 $srcdir/$subdir/$test.stp
-
+stap_run2 $srcdir/$subdir/$test.stp -w
 
diff --git a/testsuite/systemtap.samples/args.exp b/testsuite/systemtap.samples/args.exp
index 8bed7c9e..6b1fd3d0 100644
--- a/testsuite/systemtap.samples/args.exp
+++ b/testsuite/systemtap.samples/args.exp
@@ -12,7 +12,7 @@ if [file exists $staprunpath] {
 }
 
 set modname "args_[pid]"
-spawn stap -k -p4 -m $modname $srcdir/$subdir/args.stp
+spawn stap -w -k -p4 -m $modname $srcdir/$subdir/args.stp
 set tmpdir NO_SUCH_FILE
 expect {
     -timeout 120
diff --git a/testsuite/systemtap.samples/poll_map.stp b/testsuite/systemtap.samples/poll_map.stp
index fb6b16e6..cd39b433 100755
--- a/testsuite/systemtap.samples/poll_map.stp
+++ b/testsuite/systemtap.samples/poll_map.stp
@@ -6,7 +6,7 @@
 global called, num_polls
 
 probe kernel.function( "sys_*" ).call {
-	called[execname(),name]++
+	called[execname(),probefunc()]++
 }
 
 probe timer.ms(1000)
diff --git a/testsuite/systemtap.string/strtol.stp b/testsuite/systemtap.string/strtol.stp
index dcd1fe71..4f579e7d 100644
--- a/testsuite/systemtap.string/strtol.stp
+++ b/testsuite/systemtap.string/strtol.stp
@@ -23,7 +23,6 @@ probe begin
 	printf("%d\n", strtol(teststr9, 16))
 	printf("%d\n", strtol(teststr9, 8))
 	printf("%d\n", strtol(teststr9, 2))
-	printf("%d\n", strtol(teststr10, 2))
 
 	exit()
 }