2007-07-10 Martin Hunt <hunt@redhat.com>

	* systemtap.context/pid.tcl: Don't try to get real ppid,
	just match pattern.

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index e4e46c4f486f1944e03065b7e265ee5566e628f3..c5c68bc428ba09044ecb7b1a8d609c7608b750d7 100644 (file)
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-10  Martin Hunt  <hunt@redhat.com>
+
+       * systemtap.context/pid.tcl: Don't try to get real ppid,
+       just match pattern.
+
 2007-07-09  Martin Hunt  <hunt@redhat.com>
 
        * systemtap.context/systemtap_test_module1.c (stm_write_cmd): 

diff --git a/testsuite/systemtap.context/pid.tcl b/testsuite/systemtap.context/pid.tcl
index e1ae989701fa2c11453ff84ab5dcd6a9bdea7ef1..a99f69b1c5374d4eff6856eca72c5f82cf0b9961 100644 (file)
--- a/testsuite/systemtap.context/pid.tcl
+++ b/testsuite/systemtap.context/pid.tcl
@@ -1,10 +1,11 @@
 set tests [list execname pexecname pid ppid tid uid euid gid egid]
 spawn stap pid.stp
+exp_internal 1
 expect {
     -timeout 240
     "READY" {
        set pid [exec echo 1 > /proc/stap_test_cmd &]
-       set ppid [lindex [split [exec grep PPid /proc/$pid/status]] 1]
+       set ppid {[0-9]*}
        set uid [exec id -ru]
        set gid [exec id -rg]
        set euid [exec id -u]
@@ -13,9 +14,10 @@ expect {
        
        set i 0
        foreach t $tests {
+           puts "Expecting [lindex $results $i]"
            expect {
                -timeout 5
-               [lindex $results $i] {
+               -re [lindex $results $i] {
                    pass $t
                }
                timeout {fail "$t - timeout"}