From e5de04ab828407a7b3f75859073c4883274d07f3 Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Wed, 15 Apr 2015 13:34:19 +0200
Subject: [PATCH] Address bz1111106 comments 5 and 6.

---
 testsuite/lib/systemtap.exp         | 2 +-
 testsuite/systemtap.base/bz5274.exp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 64b4b60df..300d71d1f 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -22,7 +22,7 @@ proc grep_kallsyms { pattern } {
 proc utrace_orig_p {} {
     # We want utrace_attach (rhel5) or utrace_attach_task (rhel6), but don't
     # get confused by the private module version of any active stap module.
-    return [grep_kallsyms "T utrace_attach"]
+    return [expr [grep_kallsyms "T utrace_attach"] || [grep_kallsyms "T .utrace_attach_task"]]
 }
 
 
diff --git a/testsuite/systemtap.base/bz5274.exp b/testsuite/systemtap.base/bz5274.exp
index 2a66d7958..d83edbf05 100644
--- a/testsuite/systemtap.base/bz5274.exp
+++ b/testsuite/systemtap.base/bz5274.exp
@@ -24,7 +24,7 @@ if {$err == "" && [file exists $test]} then {
     fail "$test compile"
 }
 
-if {[catch {exec stap $tpath.stp -c "$srcdir/$subdir/$test.sh"} res]} {
+if {[catch {exec stap -w $tpath.stp -c "$srcdir/$subdir/$test.sh"} res]} {
     untested "$test longjmp to a uretprobed function"
     verbose -log "$res"
     catch {exec rm -f $test.out}
-- 
2.43.5