diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 14 | ||||
| -rw-r--r-- | testsuite/lib/stap_run.exp | 1 | ||||
| -rw-r--r-- | testsuite/systemtap.base/optim_arridx.exp | 8 | ||||
| -rw-r--r-- | testsuite/systemtap.base/uprobes.exp | 5 | ||||
| -rwxr-xr-x | testsuite/systemtap.base/uprobes.stp | 4 | ||||
| -rw-r--r-- | testsuite/systemtap.examples/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.examples/general/para-callgraph.meta | 4 | ||||
| -rwxr-xr-x | testsuite/systemtap.examples/io/traceio2.stp | 4 |
8 files changed, 34 insertions, 11 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 288705b1..bc8af108 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,17 @@ +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. + +2008-09-11 Frank Ch. Eigler <fche@elastic.org> + + PR 6871. + * systemtap.base/uprobes.*: Energize. + 2008-09-10 Josh Stone <joshua.i.stone@intel.com> * systemtap.base/probe_list.exp: New test for correct probe listing. diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index c0027e95..a4beaa12 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -34,6 +34,7 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } expect { -timeout 180 -re {^WARNING: cannot find module [^\r]*DWARF[^\r]*\r\n} {exp_continue} + -re {^WARNING: No unwind data for /.+\r\n} {exp_continue} -re {^Pass\ ([1234]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms\.\r\n} {set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"; exp_continue} -re {^Pass\ ([34]): using cached [^\r]+\r\n} diff --git a/testsuite/systemtap.base/optim_arridx.exp b/testsuite/systemtap.base/optim_arridx.exp index 89282d1b..bef4d2b4 100644 --- a/testsuite/systemtap.base/optim_arridx.exp +++ b/testsuite/systemtap.base/optim_arridx.exp @@ -9,15 +9,15 @@ elide_idx1:long elide_global_a:long elide_global_b:long # functions -fna:long (a:long) -return a -fnb:long (a:long, b:long) -return (a) + (b) exit:unknown () %{ atomic_set (&session_state, STAP_SESSION_STOPPING); _stp_exit (); %} +fna:long (a:long) +return a +fnb:long (a:long, b:long) +return (a) + (b) # probes begin /* <- begin */ # locals diff --git a/testsuite/systemtap.base/uprobes.exp b/testsuite/systemtap.base/uprobes.exp index 8fbe6da6..391f5028 100644 --- a/testsuite/systemtap.base/uprobes.exp +++ b/testsuite/systemtap.base/uprobes.exp @@ -8,6 +8,7 @@ set fp [open $path "w"] puts $fp "int main (int argc, char *argv[])" puts $fp "{" puts $fp "if (argc > 1) main (argc - 1, argv);" +puts $fp "return 0;" puts $fp "}" close $fp @@ -30,8 +31,8 @@ expect { -re {^Disabling[^\r\n]*\r\n} { exp_continue } -re {^Uprobes[^\r\n]*\r\n} { exp_continue } -re {^Cache[^\r\n]*\r\n} { exp_continue } - -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*call\r\n} { incr ok; exp_continue } - -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*return\r\n} { incr ok; exp_continue } + -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*call argc=0x[1-5][^\r\n]*\r\n} { incr ok; exp_continue } + -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*return return=0x0[^\r\n]*\r\n} { incr ok; exp_continue } -timeout 30 timeout { } eof { } diff --git a/testsuite/systemtap.base/uprobes.stp b/testsuite/systemtap.base/uprobes.stp index 8e7dbe9d..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", |