From 72d6163b2884120f2c8444d8711d38e1633850ba Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Thu, 25 Aug 2011 12:14:10 -0400
Subject: [PATCH] PR 11441 - continue with unprivileged test suite

- New unprivileged_all.exp replaces previously existing unprivileged
  mode test suites.
- Tests all known probe point types for expected success/failure for
  unprivileged users.
- Checks the above directly and also using an alias.
- Checks that all known probe point types have been tested (uses
  --dump-probe-types).
---
 testsuite/systemtap.unprivileged/foo.c        |  26 +-
 testsuite/systemtap.unprivileged/libfoo.c     |   9 +
 .../unprivileged_all.exp                      | 417 ++++++++++++++++++
 .../unprivileged_build.exp                    | 167 -------
 .../systemtap.unprivileged/unprivilegedko.exp |  26 --
 .../systemtap.unprivileged/unprivilegedok.exp |  28 --
 6 files changed, 449 insertions(+), 224 deletions(-)
 create mode 100644 testsuite/systemtap.unprivileged/libfoo.c
 create mode 100644 testsuite/systemtap.unprivileged/unprivileged_all.exp
 delete mode 100644 testsuite/systemtap.unprivileged/unprivileged_build.exp
 delete mode 100644 testsuite/systemtap.unprivileged/unprivilegedko.exp
 delete mode 100644 testsuite/systemtap.unprivileged/unprivilegedok.exp

diff --git a/testsuite/systemtap.unprivileged/foo.c b/testsuite/systemtap.unprivileged/foo.c
index 996a97716..346649e74 100644
--- a/testsuite/systemtap.unprivileged/foo.c
+++ b/testsuite/systemtap.unprivileged/foo.c
@@ -1,8 +1,28 @@
-/* Test application */
-void bar () {
+#include <pthread.h>
+#include "sys/sdt.h"
+
+extern libfoofunc (void);
+
+/* Thread entry point */
+void *bar (void *b) {
+ a:
+  return b;
+}
+
+/* We need an inline function. */
+inline void ibar (void) {
+/* We need a threaded app. */
+  void *x;
+  STAP_PROBE(_test_, main_enter);
+  pthread_t thread;
+  pthread_attr_t attr;
+  pthread_attr_init(&attr);
+  pthread_create (& thread, & attr, bar, 0);
+  pthread_join (thread, & x);
 }
 
 main () {
-  bar ();
+  ibar ();
+  libfoofunc ();
   return 0;
 }
diff --git a/testsuite/systemtap.unprivileged/libfoo.c b/testsuite/systemtap.unprivileged/libfoo.c
new file mode 100644
index 000000000..512c595fd
--- /dev/null
+++ b/testsuite/systemtap.unprivileged/libfoo.c
@@ -0,0 +1,9 @@
+#include "sys/sdt.h"
+
+inline void ilibfoofunc (void) {
+  STAP_PROBE(_test_, libfoofunc_enter);
+}
+
+void libfoofunc (void) {
+  ilibfoofunc ();
+}
diff --git a/testsuite/systemtap.unprivileged/unprivileged_all.exp b/testsuite/systemtap.unprivileged/unprivileged_all.exp
new file mode 100644
index 000000000..9d7dd00f3
--- /dev/null
+++ b/testsuite/systemtap.unprivileged/unprivileged_all.exp
@@ -0,0 +1,417 @@
+set test unprivilegedall
+
+set exepath "foo"
+set sopath "libfoo.so"
+
+# These probe types should be acceptable for unprivileged users
+set valid_probe_types [list \
+  "begin" \
+  "begin(number)" \
+  "end" \
+  "end(number)" \
+  "error" \
+  "error(number)" \
+  "never" \
+  "process.begin" \
+  "process.end" \
+  "process.function(number)" \
+  "process.function(number).call" \
+  "process.function(number).inline" \
+  "process.function(number).return" \
+  "process.function(string)" \
+  "process.function(string).call" \
+  "process.function(string).inline" \
+  "process.function(string).label(string)" \
+  "process.function(string).return" \
+  "process.library(string).function(number)" \
+  "process.library(string).function(number).call" \
+  "process.library(string).function(number).inline" \
+  "process.library(string).function(number).return" \
+  "process.library(string).function(string)" \
+  "process.library(string).function(string).call" \
+  "process.library(string).function(string).inline" \
+  "process.library(string).function(string).return" \
+  "process.library(string).mark(string)" \
+  "process.library(string).provider(string).mark(string)" \
+  "process.library(string).statement(number)" \
+  "process.library(string).statement(string)" \
+  "process.mark(string)" \
+  "process.statement(number)" \
+  "process.statement(string)" \
+  "process.syscall" \
+  "process.syscall.return" \
+  "process.thread.begin" \
+  "process.thread.end" \
+  "process(number).begin" \
+  "process(number).end" \
+  "process(number).statement(number).absolute" \
+  "process(number).statement(number).absolute.return" \
+  "process(number).syscall" \
+  "process(number).syscall.return" \
+  "process(number).thread.begin" \
+  "process(number).thread.end" \
+  "process(string).begin" \
+  "process(string).end" \
+  "process(string).function(number)" \
+  "process(string).function(number).call" \
+  "process(string).function(number).inline" \
+  "process(string).function(number).return" \
+  "process(string).function(string)" \
+  "process(string).function(string).call" \
+  "process(string).function(string).inline" \
+  "process(string).function(string).label(string)" \
+  "process(string).function(string).return" \
+  "process(string).library(string).function(number)" \
+  "process(string).library(string).function(number).call" \
+  "process(string).library(string).function(number).inline" \
+  "process(string).library(string).function(number).return" \
+  "process(string).library(string).function(string)" \
+  "process(string).library(string).function(string).call" \
+  "process(string).library(string).function(string).inline" \
+  "process(string).library(string).function(string).return" \
+  "process(string).library(string).mark(string)" \
+  "process(string).library(string).provider(string).mark(string)" \
+  "process(string).library(string).statement(number)" \
+  "process(string).library(string).statement(string)" \
+  "process(string).mark(string)" \
+  "process(string).provider(string).mark(string)" \
+  "process(string).statement(number)" \
+  "process(string).statement(string)" \
+  "process(string).syscall" \
+  "process(string).syscall.return" \
+  "process(string).thread.begin" \
+  "process(string).thread.end" \
+  "timer.hz(number)" \
+  "timer.jiffies(number)" \
+  "timer.jiffies(number).randomize(number)" \
+  "timer.ms(number)" \
+  "timer.ms(number).randomize(number)" \
+  "timer.msec(number)" \
+  "timer.msec(number).randomize(number)" \
+  "timer.ns(number)" \
+  "timer.ns(number).randomize(number)" \
+  "timer.nsec(number)" \
+  "timer.nsec(number).randomize(number)" \
+  "timer.s(number)" \
+  "timer.s(number).randomize(number)" \
+  "timer.sec(number)" \
+  "timer.sec(number).randomize(number)" \
+  "timer.us(number)" \
+  "timer.us(number).randomize(number)" \
+  "timer.usec(number)" \
+  "timer.usec(number).randomize(number)" \
+]
+
+# These probes should not be acceptable to pass 2 for unprivileged users
+set invalid_probe_types [list \
+  "process(string).insn" \
+  "kernel.data(number).length(number).rw" \
+  "kernel.data(number).length(number).write" \
+  "kernel.data(number).rw" \
+  "kernel.data(number).write" \
+  "kernel.data(string).rw" \
+  "kernel.data(string).write" \
+  "kernel.function(number)" \
+  "kernel.function(number).call" \
+  "kernel.function(number).inline" \
+  "kernel.function(number).return" \
+  "kernel.function(number).return.maxactive(number)" \
+  "kernel.function(string)" \
+  "kernel.function(string).call" \
+  "kernel.function(string).inline" \
+  "kernel.function(string).label(string)" \
+  "kernel.function(string).return" \
+  "kernel.function(string).return.maxactive(number)" \
+  "kernel.mark(string)" \
+  "kernel.mark(string).format(string)" \
+  "kernel.statement(number)" \
+  "kernel.statement(number).absolute" \
+  "kernel.statement(string)" \
+  "kernel.trace(string)" \
+  "kprobe.function(string)" \
+  "kprobe.function(string).return" \
+  "kprobe.function(string).return.maxactive(number)" \
+  "kprobe.module(string).function(string)" \
+  "kprobe.module(string).function(string).return" \
+  "kprobe.module(string).function(string).return.maxactive(number)" \
+  "kprobe.statement(number).absolute" \
+  "module(string).function(number)" \
+  "module(string).function(number).call" \
+  "module(string).function(number).inline" \
+  "module(string).function(number).return" \
+  "module(string).function(number).return.maxactive(number)" \
+  "module(string).function(string)" \
+  "module(string).function(string).call" \
+  "module(string).function(string).inline" \
+  "module(string).function(string).label(string)" \
+  "module(string).function(string).return" \
+  "module(string).function(string).return.maxactive(number)" \
+  "module(string).statement(number)" \
+  "module(string).statement(string)" \
+  "perf.type(number).config(number)" \
+  "perf.type(number).config(number).sample(number)" \
+  "process.function(number).return.maxactive(number)" \
+  "process.function(string).return.maxactive(number)" \
+  "process.library(string).function(number).return.maxactive(number)" \
+  "process.library(string).function(string).return.maxactive(number)" \
+  "process(number).insn" \
+  "process(number).insn.block" \
+  "process(string).function(number).return.maxactive(number)" \
+  "process(string).function(string).return.maxactive(number)" \
+  "process(string).insn.block" \
+  "process(string).library(string).function(number).return.maxactive(number)" \
+  "process(string).library(string).function(string).return.maxactive(number)" \
+  "procfs.read" \
+  "procfs.write" \
+  "procfs.read.maxsize(number)" \
+  "procfs.umask(number).read" \
+  "procfs.umask(number).read.maxsize(number)" \
+  "procfs.umask(number).write" \
+  "procfs(string).read" \
+  "procfs(string).read.maxsize(number)" \
+  "procfs(string).write" \
+  "procfs(string).umask(number).read" \
+  "procfs(string).umask(number).read.maxsize(number)" \
+  "procfs(string).umask(number).write" \
+  "timer.profile" \
+]
+
+# Add arguments to a probe type template.
+proc add_args { probe_type } {
+    global exepath sopath
+
+    set probe "$probe_type"
+
+    # Replace "hz(number)" with "hz(1000)"
+    regsub -all "hz\\(number\\)" $probe "hz(1000)" probe
+    # Replace "ns(number)" with "ns(100000)"
+    regsub -all "ns\\(number\\)" $probe "ns(100000)" probe
+    # Replace "nsec(number)" with "nsec(100000)"
+    regsub -all "nsec\\(number\\)" $probe "nsec(100000)" probe
+    # Replace "us(number)" with "us(100)"
+    regsub -all "us\\(number\\)" $probe "us(100)" probe
+    # Replace "usec(number)" with "usec(100)"
+    regsub -all "usec\\(number\\)" $probe "usec(100)" probe
+
+    # Replace "library(string).function(string).inline" with "library(string).function("ilibfoofunc").inline"
+    regsub -all "library\\(string\\).function\\(string\\).inline" $probe "library(string).function(\"ilibfoofunc\").inline" probe
+
+    # Replace "function(string).inline" with "function("ibar").inline"
+    regsub -all "function\\(string\\).inline" $probe "function(\"ibar\").inline" probe
+
+    # Replace "library(string).function(string)" with "library(string.function("libfoofunc")"
+    regsub -all "library\\(string\\).function\\(string\\)" $probe "library(string).function(\"libfoofunc\")" probe
+    # Replace "library(string).function(number)" with "library(string).function($addr_of_libfoofunc)"
+    set addr_of_libfoofunc [exec objdump -d $sopath | awk {/<libfoofunc>/ { printf "0x%s\n",$1 }}]
+    regsub -all "library\\(string\\).function\\(number\\)" $probe "library(string).function($addr_of_libfoofunc)" probe
+
+    # Replace "function(string)" with "function("bar")"
+    regsub -all "function\\(string\\)" $probe "function(\"bar\")" probe
+    # Replace "function(number)" with "function($addr_of_bar)"
+    set addr_of_bar [exec objdump -d $exepath | awk {/<bar>/ { printf "0x%s\n",$1 }}]
+    regsub -all "function\\(number\\)" $probe "function($addr_of_bar)" probe
+
+    # Replace "label(string)" with "label("a")"
+    regsub -all "label\\(string\\)" $probe "label(\"a\")" probe
+
+    # Replace "library(string).mark(string)" with "library(string).mark("libfoofunc_enter")"
+    regsub -all "library\\(string\\).mark\\(string\\)" $probe "library(string).mark(\"libfoofunc_enter\")" probe
+    # Replace "library(string).provider(string).mark(string)" with "library(string).provider(string).mark("libfoofunc_enter")"
+    regsub -all "library\\(string\\).provider\\(string\\).mark\\(string\\)" $probe "library(string).provider(string).mark(\"libfoofunc_enter\")" probe
+    # Replace "mark(string)" with "mark("main_enter")"
+    regsub -all "mark\\(string\\)" $probe "mark(\"main_enter\")" probe
+
+    # Replace "library(string).statement(number)" with "library(string).statement($addr_of_libfoofunc)"
+    set addr_of_libfoofunc [exec objdump -d $sopath | awk {/<libfoofunc>/ { printf "0x%s\n",$1 }}]
+    regsub -all "library\\(string\\).statement\\(number\\)" $probe "library(string).statement($addr_of_libfoofunc)" probe
+    # Replace "library(string).statement(string)" with "library(string).statement("libfoofunc@libfoo.c:*")"
+    regsub -all "library\\(string\\).statement\\(string\\)" $probe "library(string).statement(\"libfoofunc@libfoo.c:*\")" probe
+
+    # Replace "statement(number)" with "statement($addr_of_bar)"
+    set addr_of_bar [exec objdump -d $exepath | awk {/<bar>/ { printf "0x%s\n",$1 }}]
+    regsub -all "statement\\(number\\)" $probe "statement($addr_of_bar)" probe
+    # Replace "statement(string)" with "statement("bar@foo.c:*")"
+    regsub -all "statement\\(string\\)" $probe "statement(\"bar@foo.c:*\")" probe
+
+    # Replace "library(string)" with "library("$sopath")"
+    regsub -all "library\\(string\\)" $probe "library(\"$sopath\")" probe
+
+    # Replace "provider(string)" with "provider("_test_")"
+    regsub -all "provider\\(string\\)" $probe "provider(\"_test_\")" probe
+
+    # Replace "(number)" with "(10)"
+    regsub -all "\\(number\\)" $probe "(10)" probe
+    # Replace "(string)" with "(\"$exepath\")"
+    regsub -all "\\(string\\)" $probe "(\"./$exepath\")" probe
+
+    return "$probe"
+}
+
+# Add required extra options according to the probe type.
+proc extra_options { probe_type } {
+    global exepath
+
+    if {[regexp "^process" $probe_type] ||
+	[regexp "^end" $probe_type] ||
+	[regexp "^error" $probe_type]} {
+	return "-c ./$exepath"
+    }
+    return ""
+}
+
+# Test valid probe types
+proc test_valid_probes { use_alias } {
+    global valid_probe_types tested test
+
+    if { $use_alias } {
+	set with_alias " with alias"
+    } else {
+	set with_alias ""
+    }
+
+    foreach probe_type $valid_probe_types {
+	# There are currently some known failures
+	switch $probe_type {
+	    process.function(number).inline -
+	    process(string).function(number).inline -
+	    process.library(string).function(number).call -
+	    process.library(string).function(number).return -
+	    process(string).library(string).function(number).call -
+	    process(string).library(string).function(number).return
+	    {
+		setup_xfail *-*-*
+	    }
+	}
+
+	# Test the probe type. If successful, the stap rc will be 0.
+	set probe [add_args $probe_type]
+
+	if { $use_alias } {
+	    set cmd [concat [list stap -p2 --unprivileged -e "probe myalias = $probe { println (\"Hello\"); exit (); } probe myalias {}"] [extra_options $probe_type]]
+	} else {
+	    set cmd [concat [list stap -p2 --unprivileged -e "probe $probe { println (\"Hello\"); exit (); }"] [extra_options $probe_type]]
+	}
+
+	verbose -log "eval exec $cmd"
+	if {! [catch {eval exec $cmd} res_stap]} {
+	    verbose -log $res_stap
+	    pass "$test: $probe_type$with_alias"
+	} else {
+	    verbose -log $res_stap
+	    fail "$test: $probe_type$with_alias"
+	}
+
+	# Indicate that this probe type has been tested
+	set tested($probe_type) 1
+    }
+}
+
+# Test invalid probe types
+proc test_invalid_probes { use_alias } {
+    global invalid_probe_types tested test
+
+    if { $use_alias } {
+	set with_alias " with alias"
+    } else {
+	set with_alias ""
+    }
+
+    set error_regexp1 ".*semantic error: probe point is not allowed for unprivileged users.*"
+    foreach probe_type $invalid_probe_types {
+	# Test the probe type. Each should fail with the expected message.
+	set probe [add_args $probe_type]
+	if { $use_alias } {
+	    set cmd [list stap --unprivileged -p2 -e "probe myalias = $probe {} probe myalias {}" ]
+	} else {
+	    set cmd [list stap --unprivileged -p2 -e "probe $probe {}" ]
+	}
+	verbose -log "eval exec $cmd"
+	catch {eval exec $cmd} res_stap
+	verbose -log $res_stap
+	if {[regexp $error_regexp1 $res_stap]} {
+	    pass "$test: $probe_type$with_alias"
+	} else {
+	    fail "$test: $probe_type$with_alias"
+	}
+
+	# Indicate that this probe type has been tested
+	set tested($probe_type) 1
+    }
+}
+
+# Need to build a user shared library.
+#set opath "[pwd]/sdt_misc_.o"
+set libflags [sdt_includes]
+set libflags "$libflags additional_flags=-g"
+set libflags "$libflags additional_flags=-O"
+set libflags "$libflags additional_flags=-Wall"
+set libflags "$libflags additional_flags=-Werror"
+#set libflags "$libflags additional_flags=$opath"
+set libflags "$libflags additional_flags=-I."
+set libflags "$libflags additional_flags=-shared"
+set libflags "$libflags additional_flags=-fPIC"
+set res [target_compile $srcdir/$subdir/libfoo.c $sopath executable $libflags ]
+if { $res == "" } {
+    pass "$test library compile"
+} else {
+    fail "$test library compile: $res"
+    untested "$test Tests"
+    return
+}
+
+# Need to build a user application
+set exeflags "additional_flags=-g"
+set exeflags "$exeflags additional_flags=-O"
+set exeflags "$exeflags additional_flags=-lpthread"
+set exeflags "$exeflags [sdt_includes]"
+set exeflags "$exeflags additional_flags=-Wl,-rpath,[pwd]"
+set exeflags "$exeflags additional_flags=-L[pwd] additional_flags=-lfoo"
+set exeflags "$exeflags compiler=gcc"
+# ppc64 needs a more restrictive constraint for the probe args
+if {[regexp "^(x86_64|i.86)$" $::tcl_platform(machine)] == 0} {
+set exeflags "$exeflags additional_flags=-DSTAP_SDT_ARG_CONSTRAINT=nr"
+}
+set res [target_compile $srcdir/systemtap.unprivileged/foo.c $exepath executable "$exeflags"]
+if { $res == "" } {
+    pass "$test exe compile"
+} else {
+    fail "$test exe compile: $res"
+    untested "$test Tests"
+    return
+}
+
+# Obtain a list of all supported probe types from stap
+verbose -log "eval exec stap --dump-probe-types"
+catch {eval exec stap --dump-probe-types} res_stap
+set all_probe_types [split $res_stap "\n"]
+
+# Initialize each probe type to untested
+foreach probe_type $all_probe_types {
+    verbose -log $probe_type
+    set tested($probe_type) 0
+}
+if {[llength all_probe_types] > 0} {
+    pass "$test: Obtain list of supported probe types"
+} else {
+    fail "$test: Obtain list of supported probe types"
+}
+
+# Now run the tests
+test_valid_probes 0
+test_valid_probes 1
+test_invalid_probes 0
+test_invalid_probes 1
+
+# Generate a failure for each untested probe type
+foreach probe_type $all_probe_types {
+    set status $tested($probe_type)
+    if {$status != 0} {
+	pass "$test: tested: $probe_type"
+    } else {
+	fail "$test: not tested: $probe_type"
+    }
+}
+
+# Cleanup
+catch {exec rm -f foo}
+catch {exec rm -f libfoo.so}
diff --git a/testsuite/systemtap.unprivileged/unprivileged_build.exp b/testsuite/systemtap.unprivileged/unprivileged_build.exp
deleted file mode 100644
index bd074cd01..000000000
--- a/testsuite/systemtap.unprivileged/unprivileged_build.exp
+++ /dev/null
@@ -1,167 +0,0 @@
-# Run the buildok tests using --unprivileged
-
-# Because we're using stap_run_batch, we can't simply add --unprivileged to the list of arguments.
-# We need to create a stap wrapper which calls the real stap while adding --unprivileged.
-set path "[exec pwd]/stap"
-set fp [open $path "w"]
-puts $fp "#!/bin/sh"
-puts $fp "exec [exec which stap] --unprivileged \"\$@\""
-close $fp
-exec chmod +x $path
-
-# Add the wrapper script to the PATH after creating it
-set savePATH "$env(PATH)"
-set env(PATH) "[exec pwd]:$env(PATH)"
-
-set self buildok
-foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
-    set test "$self/[file tail $file]"
-    verbose -log "Running $file"
-    set rc [stap_run_batch $file]
-
-    # some tests are known to fail ...
-    buildok_known_failures $test $rc
-
-    # Other tests should fail with --unprivileged
-    set pass 0
-    switch $test {
-	buildok/atomic.stp -
-	buildok/aux_syscalls-embedded.stp -
-	buildok/cmdline01.stp -
-	buildok/context-embedded.stp -
-	buildok/context-symbols-embedded.stp -
-	buildok/context-unwind-embedded.stp -
-	buildok/conversions-embedded.stp -
-	buildok/conversions-guru-embedded.stp -
-	buildok/conversions.stp -
-	buildok/ctime-embedded.stp -
-	buildok/dentry-embedded.stp -
-	buildok/dev-embedded.stp -
-	buildok/eighteen.stp -
-	buildok/endian-embedded.stp -
-	buildok/errno-embedded.stp -
-	buildok/fifteen.stp -
-	buildok/five.stp -
-	buildok/fortyfive.stp -
-	buildok/fortysix.stp -
-	buildok/fortytwo.stp -
-	buildok/fourteen.stp -
-	buildok/fourteen-plus.stp -
-	buildok/gtod_noinit.stp -
-	buildok/gtod_init.stp -
-	buildok/hwbkpt.stp -
-	buildok/inet-embedded.stp -
-	buildok/inet_sock-embedded.stp -
-	buildok/ioblock-all-probes.stp -
-	buildok/ioblock-detailed.stp -
-	buildok/ioblock-embedded.stp -
-	buildok/ioscheduler-all-probes.stp -
-	buildok/ioscheduler-detailed.stp -
-	buildok/ioscheduler-embedded.stp -
-	buildok/ip-embedded.stp -
-	buildok/ipmib-all-probes.stp -
-	buildok/ipmib-detailed.stp -
-	buildok/ipmib-embedded.stp -
-	buildok/kprocess-all-probes.stp -
-	buildok/kprocess-detailed.stp -
-	buildok/kprocess-embedded.stp -
-	buildok/linuxmib-all-probes.stp -
-	buildok/linuxmib-detailed.stp -
-	buildok/logging-embedded.stp -
-	buildok/maxactive01.stp -
-	buildok/memory-all-probes.stp -
-	buildok/memory-detailed.stp -
-	buildok/memory-embedded.stp -
-	buildok/memory.stp -
-	buildok/nd_syscalls-all-probes.stp -
-	buildok/nd_syscalls-arch-detailed.stp -
-	buildok/nd_syscalls-detailed.stp -
-	buildok/nd_syscalls2-detailed.stp -
-	buildok/networking-all-probes.stp -
-	buildok/networking-detailed.stp -
-	buildok/networking-embedded.stp -
-	buildok/nfs-all-probes.stp -
-	buildok/nfs-detailed.stp -
-	buildok/nfs-embedded.stp -
-	buildok/nfs_proc-detailed.stp -
-	buildok/nfsd-all-probes.stp -
-	buildok/nfsd-detailed.stp -
-	buildok/nfsd-embedded.stp -
-	buildok/nfsderrno-embedded.stp -
-	buildok/pr10678.stp - 
-	buildok/pretty.stp -
-	buildok/process_test.stp -
-	buildok/procfs01.stp - 
-	buildok/proc_mem-embedded.stp -
-	buildok/rpc-all-probes.stp - 
-	buildok/rpc-detailed.stp -
-	buildok/rpc-embedded.stp -
-	buildok/scheduler-all-probes.stp -
-	buildok/scheduler-detailed.stp -
-	buildok/scheduler-embedded.stp -
-	buildok/scsi-all-probes.stp -
-	buildok/scsi-detailed.stp -
-	buildok/scsi-embedded.stp -
-	buildok/seven.stp -
-	buildok/seventeen.stp -
-	buildok/signal-all-probes.stp -
-	buildok/signal-detailed.stp -
-	buildok/signal-embedded.stp -
-	buildok/socket-all-probes.stp -
-	buildok/socket-detailed.stp -
-	buildok/socket-embedded.stp -
-	buildok/syscall.stp -
-	buildok/syscalls-arch-detailed.stp -
-	buildok/syscalls-detailed.stp -
-	buildok/syscalls2-detailed.stp -
-	buildok/system-embedded.stp -
-	buildok/task-embedded.stp -
-	buildok/task_test.stp -
-	buildok/task_time-embedded.stp -
-	buildok/tcp-all-probes.stp -
-	buildok/tcp-detailed.stp -
-	buildok/tcp-embedded.stp -
-	buildok/tcp_test.stp -
-	buildok/tcpmib-all-probes.stp -
-	buildok/tcpmib-detailed.stp -
-	buildok/tcpmib-embedded.stp -
-	buildok/thirteen.stp -
-	buildok/thirtyfour.stp -
-	buildok/thirtyone.stp -
-	buildok/thirtytwo.stp -
-	buildok/three.stp -
-	buildok/timestamp-embedded.stp -
-	buildok/tty-detailed.stp -
-	buildok/twenty.stp -
-	buildok/twentyeight.stp -
-	buildok/twentyfour.stp -
-	buildok/twentynine.stp -
-	buildok/twentyseven.stp -
-	buildok/twentythree.stp -
-	buildok/twentytwo.stp -
-	buildok/two.stp -
-	buildok/ucontext-symbols-embedded.stp -
-	buildok/udp-all-probes.stp -
-	buildok/udp-detailed.stp -
-	buildok/udp_test.stp -
-	buildok/vfs-all-probes.stp -
-	buildok/vfs-detailed.stp -
-	buildok/vfs-embedded.stp -
-	buildok/xtime.stp {
-	    set expected_result "should not build"
-	    if {$rc != 0} { set pass 1 }
-	}
-	default {
-	    set expected_result "should build"
-	    if {$rc == 0} { set pass 1}
-	}
-    }
-    if {$pass == 1} {
-	pass "$test $expected_result with --unprivileged"
-    } else {
-	fail "$test $expected_result with --unprivileged"
-    }
-}
-
-# Restore the path
-set env(PATH) "$savePATH"
diff --git a/testsuite/systemtap.unprivileged/unprivilegedko.exp b/testsuite/systemtap.unprivileged/unprivilegedko.exp
deleted file mode 100644
index c5e23fb24..000000000
--- a/testsuite/systemtap.unprivileged/unprivilegedko.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-set test unprivilegedko
-
-# These probes should not be acceptable to pass 2
-set invalid_probes [list \
-  {kernel.function("sys_read") {}} \
-  {kernel.trace("*") {}} \
-  {module("*scsi*").function("*") {}} \
-  {kernel.mark("*") {}} \
-  {kernel.mark("*").format("*") {}} \
-  {syscall.open {}} \
-  {myalias = syscall.open {} probe myalias {}} \
-]
-
-set error_regexp1 ".*semantic error: probe point is not allowed for unprivileged users.*"
-set error_regexp2 ".*semantic error: no match while resolving probe point syscall.open.*"
-foreach probe $invalid_probes {
-    set cmd [list stap --unprivileged -p2 -e "probe $probe" ]
-    verbose -log "eval exec $cmd"
-    catch {eval exec $cmd} res_stap
-    verbose -log $res_stap
-    if {[regexp $error_regexp1 $res_stap] || [regexp $error_regexp2 $res_stap]} {
-	pass "$test: $probe"
-    } else {
-	fail "$test: $probe"
-    }
-}
diff --git a/testsuite/systemtap.unprivileged/unprivilegedok.exp b/testsuite/systemtap.unprivileged/unprivilegedok.exp
deleted file mode 100644
index a59766de9..000000000
--- a/testsuite/systemtap.unprivileged/unprivilegedok.exp
+++ /dev/null
@@ -1,28 +0,0 @@
-set test unprivilegedok
-
-# Need to build a user application
-catch {exec gcc -g -o foo $srcdir/systemtap.unprivileged/foo.c} err
-if {$err == "" && [file exists foo]} then { pass "$test compile" } else { fail "$test compile: $err" }
-
-# These probes should be acceptable for unprivileged users
-set valid_probes [list \
-  {%(CONFIG_UTRACE=="y" %? process("foo").begin %: end %)} \
-  {%(CONFIG_UTRACE=="y" %? process("foo").function("bar") %: end %)} \
-  {%(CONFIG_UTRACE=="y" %? process("foo").function("bar").call %: end %)} \
-  {%(CONFIG_UTRACE=="y" %? process("foo").function("bar").return %: end %)} \
-  {myalias = %(CONFIG_UTRACE=="y" %? process("foo").function("bar").return %: end %) {} probe myalias} \
-]
-
-foreach probe $valid_probes {
-    set cmd [list stap --unprivileged -e "probe $probe { println (\"Hello\"); }" -c ./foo ]
-    verbose -log "eval exec $cmd"
-    catch {eval exec $cmd} res_stap
-    verbose -log $res_stap
-    if { "$res_stap" == "Hello" } {
-	pass "$test: $probe"
-    } else {
-	fail "$test: $probe"
-    }
-}
-
-catch {exec rm -f foo}
-- 
2.43.5