Added tests for 'process(PID)' variants.

2008-06-27  David Smith  <dsmith@redhat.com>

	* systemtap.base/utrace_p4.exp: Added tests for 'process(PID)'
	variants.

1 files changed, 62 insertions, 6 deletions

diff --git a/testsuite/systemtap.base/utrace_p4.exp b/testsuite/systemtap.base/utrace_p4.exp
index 5544ee55..333cff21 100644
--- a/testsuite/systemtap.base/utrace_p4.exp
+++ b/testsuite/systemtap.base/utrace_p4.exp
@@ -25,6 +25,7 @@ proc stap_compile { TEST_NAME compile script args } {
 	-re "parse error" { incr compile_errors 1; exp_continue}
 	-re "compilation failed" {incr compile_errors 1; exp_continue}
 	-re "semantic error:" {incr compile_errors 1; exp_continue}
+	-re "terminate called" {incr compile_errors 1; exp_continue}
     }
     catch close
     wait
@@ -56,6 +57,13 @@ set syscall_return_script {"probe process(\"/bin/ls\").syscall.return { printf(\
 set thread_begin_script {"probe process(\"/bin/ls\").thread.begin { print(\"ls thread.begin\") }"}
 set thread_end_script {"probe process(\"/bin/ls\").thread.end { print(\"ls thread.end\") }"}
 
+set pid_begin_script {"probe process(123).begin { print(\"123 begin\") }"}
+set pid_end_script {"probe process(123).end { print(\"123 end\") }"}
+set pid_syscall_script {"probe process(123).syscall { printf(\"|%d\", \$syscall) }"}
+set pid_syscall_return_script {"probe process(123).syscall.return { printf(\"|%d\", \$syscall) }"}
+set pid_thread_begin_script {"probe process(123).thread.begin { print(\"123 thread.begin\") }"}
+set pid_thread_end_script {"probe process(123).thread.end { print(\"123 thread.end\") }"}
+
 # Try to find utrace_attach symbol in /proc/kallsyms
 set path "/proc/kallsyms"
 if {! [catch {exec grep -q utrace_attach $path} dummy]} {
@@ -70,46 +78,94 @@ set TEST_NAME "UTRACE_P4_01"
 if {$utrace_support_found == 0} {
     untested "$TEST_NAME : no kernel utrace support found"
 } else {
-    # Try compiling a begin script
+    # Try compiling a begin script using a path
     stap_compile $TEST_NAME 1 $begin_script
 }
 
+set TEST_NAME "UTRACE_P4_01_pid"
+if {$utrace_support_found == 0} {
+    untested "$TEST_NAME : no kernel utrace support found"
+} else {
+    # Try compiling a begin script using a pid
+    stap_compile $TEST_NAME 1 $pid_begin_script
+}
+
 set TEST_NAME "UTRACE_P4_02"
 if {$utrace_support_found == 0} {
     untested "$TEST_NAME : no kernel utrace support found"
 } else {
-    # Try compiling a end script
+    # Try compiling a end script using a path
     stap_compile $TEST_NAME 1 $end_script
 }
 
+set TEST_NAME "UTRACE_P4_02_pid"
+if {$utrace_support_found == 0} {
+    untested "$TEST_NAME : no kernel utrace support found"
+} else {
+    # Try compiling a end script using a pid
+    stap_compile $TEST_NAME 1 $pid_end_script
+}
+
 set TEST_NAME "UTRACE_P4_03"
 if {$utrace_support_found == 0} {
     untested "$TEST_NAME : no kernel utrace support found"
 } else {
-    # Try compiling a syscall script
+    # Try compiling a syscall script using a path
     stap_compile $TEST_NAME 1 $syscall_script
 }
 
+set TEST_NAME "UTRACE_P4_03_pid"
+if {$utrace_support_found == 0} {
+    untested "$TEST_NAME : no kernel utrace support found"
+} else {
+    # Try compiling a syscall script using a pid
+    stap_compile $TEST_NAME 1 $pid_syscall_script
+}
+
 set TEST_NAME "UTRACE_P4_04"
 if {$utrace_support_found == 0} {
     untested "$TEST_NAME : no kernel utrace support found"
 } else {
-    # Try compiling a syscall return script
+    # Try compiling a syscall return script using a path
     stap_compile $TEST_NAME 1 $syscall_return_script
 }
 
+set TEST_NAME "UTRACE_P4_04_pid"
+if {$utrace_support_found == 0} {
+    untested "$TEST_NAME : no kernel utrace support found"
+} else {
+    # Try compiling a syscall return script using a pid
+    stap_compile $TEST_NAME 1 $pid_syscall_return_script
+}
+
 set TEST_NAME "UTRACE_P4_05"
 if {$utrace_support_found == 0} {
     untested "$TEST_NAME : no kernel utrace support found"
 } else {
-    # Try compiling an thread.begin script
+    # Try compiling an thread.begin script using a path
     stap_compile $TEST_NAME 1 $thread_begin_script
 }
 
+set TEST_NAME "UTRACE_P4_05_pid"
+if {$utrace_support_found == 0} {
+    untested "$TEST_NAME : no kernel utrace support found"
+} else {
+    # Try compiling an thread.begin script using a pid
+    stap_compile $TEST_NAME 1 $pid_thread_begin_script
+}
+
 set TEST_NAME "UTRACE_P4_06"
 if {$utrace_support_found == 0} {
     untested "$TEST_NAME : no kernel utrace support found"
 } else {
-    # Try compiling an thread.end script
+    # Try compiling an thread.end script using a path
     stap_compile $TEST_NAME 1 $thread_end_script
 }
+
+set TEST_NAME "UTRACE_P4_06_pid"
+if {$utrace_support_found == 0} {
+    untested "$TEST_NAME : no kernel utrace support found"
+} else {
+    # Try compiling an thread.end script using a pid
+    stap_compile $TEST_NAME 1 $pid_thread_end_script
+}