From 30cd73d30479b05ae2511a68fb53bae88e7f478e Mon Sep 17 00:00:00 2001
From: mmason <mmason>
Date: Sat, 13 Jan 2007 19:05:07 +0000
Subject: Fix for ioblocktest.exp test (PR 3867)

---
 testsuite/ChangeLog                         | 8 ++++++++
 testsuite/systemtap.samples/ioblocktest.stp | 8 +++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'testsuite')

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 43b50f8b..e3452ee7 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-13  Mike Mason <mmlnx@us.ibm.com>
+
+	PR 3867
+	* systemtap.samples/ioblocktest.stp: Fixed so only
+	checks bit 0 (Read/Write bit) of bio->bi_rw. Also merged
+	ioblock.request and ioblock.end probes. They do the same
+	thing.
+
 2007-01-10  Martin Hunt  <hunt@redhat.com>
 
 	* systemtap.maps/foreach_foreach.exp: Update for new delete func.
diff --git a/testsuite/systemtap.samples/ioblocktest.stp b/testsuite/systemtap.samples/ioblocktest.stp
index 43b3e7d0..4aa3c3a9 100644
--- a/testsuite/systemtap.samples/ioblocktest.stp
+++ b/testsuite/systemtap.samples/ioblocktest.stp
@@ -2,11 +2,9 @@
 global teststr
 probe begin { log("systemtap starting probe") }
 
-probe ioblock.request {
-   teststr = sprintf("ioblock: %s\t%d\t%s\t%d\n", devname, sector, bio_rw_str(rw), rw)
-}
-probe ioblock.end {
-   teststr = sprintf("ioblock: %s\t%d\t%s\t%d\n", devname, sector, bio_rw_str(rw), rw) 
+probe ioblock.request, ioblock.end {
+   teststr = sprintf("ioblock: %s\t%d\t%s\t%d\n", devname, sector,
+                      bio_rw_str(rw), bio_rw_num(rw))
 }
 probe end { 
    log("systemtap ending probe")
-- 
cgit