diff options
| author | Dave Brolley <brolley@redhat.com> | 2008-08-29 16:10:01 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2008-08-29 16:10:01 -0400 |
| commit | 0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c (patch) | |
| tree | add6c27ae60763af4c4a1aa90db7f65e465759e3 /testsuite | |
| parent | d1f2fc72bf8506d0ac166cddb07576c7c4a1fea6 (diff) | |
| parent | 8d142c018986acb256a08c1232f4f5ff0ee063df (diff) | |
| download | systemtap-steved-0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c.tar.gz systemtap-steved-0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c.tar.xz systemtap-steved-0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
ChangeLog
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 6 | ||||
| -rwxr-xr-x | testsuite/semok/optimize.stp | 1 | ||||
| -rw-r--r-- | testsuite/systemtap.base/global_end.exp | 8 | ||||
| -rw-r--r-- | testsuite/systemtap.base/utrace_p5.exp | 27 |
4 files changed, 37 insertions, 5 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index e6649a36..a0e19521 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2008-08-29 David Smith <dsmith@redhat.com> + + PR6841 + * systemtap.base/utrace_p5.exp: Added system-wide syscall test for + bug 6841 fix. + 2008-08-27 Stan Cox <scox@redhat.com> * systemtap.base/global_end.exp: New. diff --git a/testsuite/semok/optimize.stp b/testsuite/semok/optimize.stp index a728bd66..621bd1ca 100755 --- a/testsuite/semok/optimize.stp +++ b/testsuite/semok/optimize.stp @@ -10,7 +10,6 @@ function zoo (x) { } probe begin { - b <<< "hello" a = b + 2 zoo (zoo (5)) b = "goodbye" diff --git a/testsuite/systemtap.base/global_end.exp b/testsuite/systemtap.base/global_end.exp index b1931a90..08cf0dea 100644 --- a/testsuite/systemtap.base/global_end.exp +++ b/testsuite/systemtap.base/global_end.exp @@ -9,10 +9,10 @@ set ok 0 expect { -timeout 180 -re {one,0x1.*one,0x2.*two,0x1.*two,0x2} { incr ok; exp_continue } - -re {alpha."one"..1.=0x1} { incr ok; exp_continue } - -re {alpha."one"..2.=0x2} { incr ok; exp_continue } - -re {alpha."two"..1.=0x3} { incr ok; exp_continue } - -re {alpha."two"..2.=0x4} { incr ok; exp_continue } + -re {alpha."one".1.=0x1} { incr ok; exp_continue } + -re {alpha."one".2.=0x2} { incr ok; exp_continue } + -re {alpha."two".1.=0x3} { incr ok; exp_continue } + -re {alpha."two".2.=0x4} { incr ok; exp_continue } -re {gamma="abcdefghijklmnopqrstuvwxyz"} { incr ok; exp_continue } -re {iota."one".="eleven"} { incr ok; exp_continue } -re {iota."two".="twelve"} { incr ok; exp_continue } diff --git a/testsuite/systemtap.base/utrace_p5.exp b/testsuite/systemtap.base/utrace_p5.exp index fcd617fe..33281350 100644 --- a/testsuite/systemtap.base/utrace_p5.exp +++ b/testsuite/systemtap.base/utrace_p5.exp @@ -73,6 +73,23 @@ set thread_end_script { } set thread_end_script_output "thread_ends = \\d+\r\n" +# Script that tests the bug 6841 fix. +set bz6841_script { + global proc,name + probe begin { printf("systemtap starting probe\n") } + probe process.syscall { + proc[pid()] <<< 1 + name[pid()] = execname() + } + probe end { printf("systemtap ending probe\n") + foreach(p+ in proc) { + printf("%s(%d) issues syscall %d times\n", + name[p], p, @sum(proc[p])) + } + } +} +set bz6841_script_output ".+ issues syscall \\d+ times\r\n" + # Try to find utrace_attach symbol in /proc/kallsyms set path "/proc/kallsyms" if {! [catch {exec grep -q utrace_attach $path} dummy]} { @@ -182,5 +199,15 @@ if {$utrace_support_found == 0} { -e $script } +set TEST_NAME "UTRACE_P5_07" +if {$utrace_support_found == 0} { + untested "$TEST_NAME : no kernel utrace support found" +} elseif {![installtest_p]} { + untested "$TEST_NAME" +} else { + stap_run $TEST_NAME run_utrace_p5_multi $bz6841_script_output \ + -e $bz6841_script +} + # Cleanup exec rm -f $exepath $multi_exepath |