Address bz1111106 comments 5 and 6.

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 64b4b60dfe8622e259c587e6c2a8c34f9adec8c5..300d71d1f9cbb220f4c570a20c8bbe8aab73166d 100644 (file)
--- 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 2a66d7958b65d5381d9f62b28c2123430d8a3ff1..d83edbf05c797c5b1deba7b6b0745ce1bf104f4c 100644 (file)
--- 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}