diff options
| author | Wenji Huang <wenji.huang@oracle.com> | 2008-10-28 02:43:23 -0400 |
|---|---|---|
| committer | Wenji Huang <wenji.huang@oracle.com> | 2008-10-28 02:43:23 -0400 |
| commit | b972f47ac298a454b8a93cfb2d2d5c3be3ad88a4 (patch) | |
| tree | 31318b672f7188fb48f4e7e56f056d1b8403bb44 /testsuite | |
| parent | ed70d5b028bf8af776380deda5e6a75857c41c28 (diff) | |
| download | systemtap-steved-b972f47ac298a454b8a93cfb2d2d5c3be3ad88a4.tar.gz systemtap-steved-b972f47ac298a454b8a93cfb2d2d5c3be3ad88a4.tar.xz systemtap-steved-b972f47ac298a454b8a93cfb2d2d5c3be3ad88a4.zip | |
Correct ioblock and scsi tapset for 2.6.28.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rwxr-xr-x | testsuite/buildok/context_test.stp | 4 | ||||
| -rwxr-xr-x | testsuite/buildok/ioblock_test.stp | 17 |
3 files changed, 20 insertions, 6 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index ec4cc401..9c82f35a 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-10-28 Wenji Huang <wenji.huang@oracle.com> + + * buildok/context_test.stp: Correct for 2.6.28. + * buildok/ioblock_test.stp: Ditto. + 2008-10-27 Josh Stone <joshua.i.stone@intel.com> * systemtap.printf/char1.stp: Expose i686 failure diff --git a/testsuite/buildok/context_test.stp b/testsuite/buildok/context_test.stp index e98b0065..84f1cbf1 100755 --- a/testsuite/buildok/context_test.stp +++ b/testsuite/buildok/context_test.stp @@ -20,12 +20,12 @@ function print_stuff () { printf("pp is %s\n", pp()) } -probe kernel.function("uptime_read_proc") { +probe kernel.function("uptime_read_proc") ? { print("NOW IN UPTIME\n") print_stuff () } -probe kernel.function("uptime_read_proc").return { +probe kernel.function("uptime_read_proc").return ? { print("DONE WITH UPTIME\n") print_stuff () exit () diff --git a/testsuite/buildok/ioblock_test.stp b/testsuite/buildok/ioblock_test.stp index 3faaab15..4d3dadfa 100755 --- a/testsuite/buildok/ioblock_test.stp +++ b/testsuite/buildok/ioblock_test.stp @@ -5,14 +5,23 @@ probe ioblock.request { add_part = 0 if (bdev != bdev_contains) add_part = p_start_sect +%(kernel_v < "2.6.28" %? printf("%s\t%d\t%d\t%d\t%s\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", - devname, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments, - hw_segments, size, add_part, ino) + devname, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments, hw_segments, size, add_part, ino) +%: + printf("%s\t%d\t%d\t%d\t%s\t%d\t%d\t%d\t%d\t%d\t%d\n", + devname, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments, size, add_part, ino) +%) + } probe ioblock.end { log(pp()) +%(kernel_v < "2.6.28" %? printf("%s\t%d\t%d\t%d\t%s\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", - devname, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments, - hw_segments, size, bytes_done, error, ino) + devname, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments, hw_segments, size, bytes_done, error, ino) +%: + printf("%s\t%d\t%d\t%d\t%s\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", + devname, sector, flags, rw, bio_rw_str(rw), vcnt, idx, phys_segments, size, bytes_done, error, ino) +%) } |