PR12276: expect path+file in [u]symfile[line] tests

diff --git a/testsuite/systemtap.context/symfileline.tcl b/testsuite/systemtap.context/symfileline.tcl
index 8054ea3f537b4951586ee9ea54eb18bcdb791bd6..ca1e308017cec80661228ccc5a0a2c97a69f808e 100644 (file)
--- a/testsuite/systemtap.context/symfileline.tcl
+++ b/testsuite/systemtap.context/symfileline.tcl
@@ -5,15 +5,13 @@ set testname symfileline
 
 # tests functions symfileline, symfile and symline
 
-set expectedoutput {"systemtap_test_module2.c:\[1-9]\[0-9]*" "\[1-9]\[0-9]*" "systemtap_test_module2.c"}
-
 spawn stap -d kernel -d systemtap_test_module2  $srcdir/$subdir/$testname.stp
 expect {
   -timeout 120
   "READY" { exec echo 1 > /proc/stap_test_cmd
     expect {
-      -re {fileline systemtap_test_module2.c:[1-9][0-9]*} { incr correct_fileline; exp_continue }
-      -re {file systemtap_test_module2.c} { incr correct_file; exp_continue }
+      -re {fileline .*systemtap_test_module2.c:[1-9][0-9]*} { incr correct_fileline; exp_continue }
+      -re {file .*systemtap_test_module2.c} { incr correct_file; exp_continue }
       -re {line [1-9][0-9]*} { incr correct_line; exp_continue }
     }
   }

diff --git a/testsuite/systemtap.context/usymfileline.exp b/testsuite/systemtap.context/usymfileline.exp
index 657616654432cf6bd5248b9929e9123c60a9f8f5..6c97a88742dfbe7fb5f1a604853eafff335320a8 100644 (file)
--- a/testsuite/systemtap.context/usymfileline.exp
+++ b/testsuite/systemtap.context/usymfileline.exp
@@ -30,7 +30,7 @@ probe process("usymfileline").function("test_method") {\
 }
 
 set tests {usymfileline usymline usymfile}
-set expectedoutput {"usymfileline.c:\[2-4]" "\[2-4]" "usymfileline.c"}
+set expectedoutput {".*usymfileline.c:\[2-4]" "\[2-4]" ".*usymfileline.c"}
 
 foreach test $tests eoutput $expectedoutput {
   set testscript [string map "TAPSETFUNCTION $test" $script]