summaryrefslogtreecommitdiffstats
path: root/testsuite/systemtap.base
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/systemtap.base')
-rw-r--r--testsuite/systemtap.base/global_end.exp8
-rw-r--r--testsuite/systemtap.base/utrace_p5.exp27
2 files changed, 31 insertions, 4 deletions
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