From 8217471ad2a14ed48b0823df316e40654b912b1f Mon Sep 17 00:00:00 2001 From: Abegail Jakop Date: Tue, 27 Jan 2015 14:22:55 -0500 Subject: [PATCH] PR12276: expect path+file in [u]symfile[line] tests --- testsuite/systemtap.context/symfileline.tcl | 6 ++---- testsuite/systemtap.context/usymfileline.exp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/testsuite/systemtap.context/symfileline.tcl b/testsuite/systemtap.context/symfileline.tcl index 8054ea3f5..ca1e30801 100644 --- 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 657616654..6c97a8874 100644 --- 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] -- 2.43.5