unprivileged awk regexp tweak to prevent false matches on s390x objdump -d.

diff --git a/testsuite/systemtap.unprivileged/unprivileged_myproc.exp b/testsuite/systemtap.unprivileged/unprivileged_myproc.exp
index f158aab40a1ba1bff135997d881c80ff4042da05..20981400d13f283dcae947f04d16f73751579379 100644 (file)
--- a/testsuite/systemtap.unprivileged/unprivileged_myproc.exp
+++ b/testsuite/systemtap.unprivileged/unprivileged_myproc.exp
@@ -293,9 +293,9 @@ if { $res == "" } {
 
 # Extract needed addresses. Note, some architectures add a '.' to the
 # function name, so match that optionally.
-set addr_of_bar [exec objdump -d $exepath | awk {/<\.?bar>/ { printf "0x%s\n",$1 }}]
+set addr_of_bar [exec objdump -d $exepath | awk {/<\.?bar>:/ { printf "0x%s\n",$1 }}]
 verbose -log "addr_of_bar: $addr_of_bar"
-set addr_of_libloopfunc [exec objdump -d $sopath | awk {/<\.?libloopfunc>/ { printf "0x%s\n",$1 }}]
+set addr_of_libloopfunc [exec objdump -d $sopath | awk {/<\.?libloopfunc>:/ { printf "0x%s\n",$1 }}]
 verbose -log "addr_of_libloopfunc: $addr_of_libloopfunc"
 
 # Obtain a list of all process* probe types from stap

diff --git a/testsuite/systemtap.unprivileged/unprivileged_probes.exp b/testsuite/systemtap.unprivileged/unprivileged_probes.exp
index 5d3640d97bd73dfc8d46149855f68753269d80fa..7c3752573436c029f6b28eb29d3b5b3bdacff9c9 100644 (file)
--- a/testsuite/systemtap.unprivileged/unprivileged_probes.exp
+++ b/testsuite/systemtap.unprivileged/unprivileged_probes.exp
@@ -367,9 +367,9 @@ if { $res == "" } {
 
 # Extract needed addresses. Note, some architectures add a '.' to the
 # function name, so match that optionally.
-set addr_of_bar [exec objdump -d $exepath | awk {/<\.?bar>/ { printf "0x%s\n",$1 }}]
+set addr_of_bar [exec objdump -d $exepath | awk {/<\.?bar>:/ { printf "0x%s\n",$1 }}]
 verbose -log "addr_of_bar: $addr_of_bar"
-set addr_of_libfoofunc [exec objdump -d $sopath | awk {/<\.?libfoofunc>/ { printf "0x%s\n",$1 }}]
+set addr_of_libfoofunc [exec objdump -d $sopath | awk {/<\.?libfoofunc>:/ { printf "0x%s\n",$1 }}]
 verbose -log "addr_of_libfoofunc: $addr_of_libfoofunc"
 
 # Obtain a list of all supported probe types from stap