From 6cfefaad912d6042f87745b43aa61d908d7e9136 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Thu, 4 Mar 2010 15:00:34 -0500 Subject: Filter the path of stap as called by the client and server. --- testsuite/systemtap.server/server_args.exp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/testsuite/systemtap.server/server_args.exp b/testsuite/systemtap.server/server_args.exp index 81a2c37b..463e98a1 100644 --- a/testsuite/systemtap.server/server_args.exp +++ b/testsuite/systemtap.server/server_args.exp @@ -57,14 +57,19 @@ proc stap_direct_and_with_client {stap stap_client options} { incr n continue } - } else { - if {[regexp "^Input file '(.*)' is empty or missing." $expected_line match data]} { - # Special characters in the regexp need to be quoted. - regsub -all "\[\"\\\\;\*\]" $data {\\\0} data - if {[regexp "^Input file 'script.*/$data' is empty or missing." $line]} { - incr n - continue - } + } elseif {[regexp "^Input file '(.*)' is empty or missing." $expected_line match data]} { + # Special characters in the regexp need to be quoted. + regsub -all "\[\"\\\\;\*\]" $data {\\\0} data + if {[regexp "^Input file 'script.*/$data' is empty or missing." $line]} { + incr n + continue + } + } elseif {[regexp "^(.*/stap): (.*)" $line match data1 data2]} { + # Special characters in the regexp need to be quoted. + regsub -all "\[\"\\\\;\*\]" $data2 {\\\0} data2 + if {[regexp "^$stap: $data2" $expected_line]} { + incr n + continue } } -- cgit