testsuite: introduce [uretprobe_p]

Some test cases assume presence of uretprobes_p, inferred from uprobes_p.
With this new predicate, they can check for uretprobes support proper.

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 874050c3ae6b2a4637efc0b45bd56331e4d83225..8582d36d265581155140242aed814d6399fce4ff 100644 (file)
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -61,6 +61,16 @@ proc uprobes_p {} {
 }
 
 
+proc uretprobes_p {} {
+    set path "/proc/kallsyms"
+    if {! [uprobes_p]} { return 0 }
+    if {! [catch {exec grep -q uretprobe $path} dummy]} { return 1 }
+    if {! [catch {exec grep -q utrace_attach $path} dummy]} { return 1 }
+    return 0
+}
+
+
+
 proc dyninst_p {} {
     global env
 

diff --git a/testsuite/systemtap.unprivileged/unprivileged_myproc.exp b/testsuite/systemtap.unprivileged/unprivileged_myproc.exp
index 6613a182671106a46cdcc306d996165df9049fd6..cb91a80f434fbfae1c3d27e01ce3f68b6c2f3ca8 100644 (file)
--- a/testsuite/systemtap.unprivileged/unprivileged_myproc.exp
+++ b/testsuite/systemtap.unprivileged/unprivileged_myproc.exp
@@ -290,14 +290,14 @@ proc test_probes { privilege } {
            process(string).library(string).function(number).return -
            process(string).library(string).function(string).return
            {
-               setup_kfail UPROBES *-*-*
+               if {![uretprobes_p]} { setup_kfail URETPROBES *-*-* }
            }
            process(number).insn -
            process(number).insn.block -
            process(string).insn -
            process(string).insn.block
            {
-               setup_kfail KERNEL *-*-*
+               setup_kfail UTRACE *-*-*
            }
            process(string).library(string).plt.statement(number) -
            process(string).library(string).plt(string).statement(number) -

diff --git a/testsuite/systemtap.unprivileged/unprivileged_probes.exp b/testsuite/systemtap.unprivileged/unprivileged_probes.exp
index 6dc4222247f2ab8c8b5901f9a03705d60a0f49ea..33561a2fa702bd9fa751cc547694d7df1b0920ce 100644 (file)
--- a/testsuite/systemtap.unprivileged/unprivileged_probes.exp
+++ b/testsuite/systemtap.unprivileged/unprivileged_probes.exp
@@ -343,7 +343,7 @@ proc test_unrestricted_probes { privilege } {
            process(string).library(string).function(number).return -
            process(string).library(string).function(string).return
            {
-               setup_kfail UPROBES *-*-*
+               if {![uretprobes_p]} { setup_kfail URETPROBES *-*-* }
            }
        }