summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2008-09-12 17:14:18 -0400
committerFrank Ch. Eigler <fche@elastic.org>2008-09-12 17:14:49 -0400
commit8b524b8e33e94007b15f33546819056b56435cf2 (patch)
tree17c4162f8df191135c19f3e8a81944f3bb9a069e
parentfe57f50ecce38860af69827f1525c012840464ab (diff)
downloadsystemtap-steved-8b524b8e33e94007b15f33546819056b56435cf2.tar.gz
systemtap-steved-8b524b8e33e94007b15f33546819056b56435cf2.tar.xz
systemtap-steved-8b524b8e33e94007b15f33546819056b56435cf2.zip
testsuite tweaks for rhel5
-rw-r--r--testsuite/ChangeLog5
-rwxr-xr-xtestsuite/systemtap.base/uprobes.stp4
-rw-r--r--testsuite/systemtap.examples/ChangeLog5
-rw-r--r--testsuite/systemtap.examples/general/para-callgraph.meta4
-rwxr-xr-xtestsuite/systemtap.examples/io/traceio2.stp4
5 files changed, 17 insertions, 5 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 18f04bbf..bc8af108 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-12 Frank Ch. Eigler <fche@elastic.org>
+
+ * systemtap.base/uprobes.stp: Use printf in case pp() is long enough
+ to overflow MAXSTRINGLEN.
+
2008-09-11 David Smith <dsmith@redhat.com>
* lib/stap_run.exp: Ignore new warning.
diff --git a/testsuite/systemtap.base/uprobes.stp b/testsuite/systemtap.base/uprobes.stp
index 32bc1a70..b609f3a1 100755
--- a/testsuite/systemtap.base/uprobes.stp
+++ b/testsuite/systemtap.base/uprobes.stp
@@ -1,3 +1,3 @@
#! stap -p4
-probe process("./jennie").function("main").call { log(pp()." ".$$parms) }
-probe process("./jennie").function("main").return { log(pp()." ".$$return) }
+probe process("./jennie").function("main").call { printf("%s %s\n",pp(),$$parms) }
+probe process("./jennie").function("main").return { printf("%s %s\n",pp(),$$return) }
diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog
index af641ba7..8d434357 100644
--- a/testsuite/systemtap.examples/ChangeLog
+++ b/testsuite/systemtap.examples/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-12 Frank Ch. Eigler <fche@elastic.org>
+
+ * io/traceio2.stp: Make compatible with RHEL5.
+ * general/para-callgraph.meta: Tweak quoting for dejagnu passage.
+
2008-08-15 Frank Ch. Eigler <fche@elastic.org>
* general/para-callgraph*: Extend.
diff --git a/testsuite/systemtap.examples/general/para-callgraph.meta b/testsuite/systemtap.examples/general/para-callgraph.meta
index 740ed5ce..9fcf26c6 100644
--- a/testsuite/systemtap.examples/general/para-callgraph.meta
+++ b/testsuite/systemtap.examples/general/para-callgraph.meta
@@ -3,5 +3,5 @@ name: para-callgraph.stp
keywords: trace callgraph
subsystem: general
description: Print a timed per-thread callgraph, complete with function parameters and return values. The first parameter names the function probe points to trace. The optional second parameter names the probe points for trigger functions, which acts to enable tracing for only those functions that occur while the current thread is nested within the trigger.
-test_check: stap -p4 para-callgraph.stp 'kernel.function("*@fs/proc*.c")' 'kernel.function("sys_read")'
-test_installcheck: stap para-callgraph.stp 'kernel.function("*@fs/proc*.c")' 'kernel.function("sys_read")' -c 'cat /proc/sys/vm/*'
+test_check: stap -p4 para-callgraph.stp kernel.function("*@fs/proc*.c") kernel.function("sys_read")
+test_installcheck: stap para-callgraph.stp kernel.function("*@fs/proc*.c") kernel.function("sys_read") -c 'cat /proc/sys/vm/*'
diff --git a/testsuite/systemtap.examples/io/traceio2.stp b/testsuite/systemtap.examples/io/traceio2.stp
index 656c38b3..988ea36c 100755
--- a/testsuite/systemtap.examples/io/traceio2.stp
+++ b/testsuite/systemtap.examples/io/traceio2.stp
@@ -12,7 +12,9 @@ probe begin {
probe kernel.function ("vfs_write"),
kernel.function ("vfs_read")
{
- dev_nr = $file->f_path->dentry->d_inode->i_sb->s_dev
+ dev_nr = $file->
+ %( kernel_v < "2.6.19" %? f_dentry %: f_path->dentry %)
+ ->d_inode->i_sb->s_dev
if (dev_nr == device_of_interest)
printf ("%s(%d) %s 0x%x\n",