From ae0489aadd680eeb2ef3875d2775fe5144d4e2f2 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Wed, 2 Nov 2011 13:28:31 +0100
Subject: [PATCH] unprivileged awk regexp tweak to prevent false matches on
 s390x objdump -d.

---
 testsuite/systemtap.unprivileged/unprivileged_myproc.exp | 4 ++--
 testsuite/systemtap.unprivileged/unprivileged_probes.exp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testsuite/systemtap.unprivileged/unprivileged_myproc.exp b/testsuite/systemtap.unprivileged/unprivileged_myproc.exp
index f158aab40..20981400d 100644
--- 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 5d3640d97..7c3752573 100644
--- 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
-- 
2.43.5