- Allow root, the owner of the uprobes build directory and the members of the

group owner of the uprobes buld directory to build uprobes.ko.

- When building uprobes.ko, make all generated files writable by the group
owner of the uprobes build directory.

- Don't change the group owner of the uprobes build directory during
'make install'

1 files changed, 7 insertions, 10 deletions

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 1a73f7cf..f16facc2 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -34,16 +34,13 @@ proc uprobes_p {} {
     set uprobes $env(SYSTEMTAP_RUNTIME)/uprobes
     set res [catch "exec make -q -C $uprobes uprobes.ko" output]
     if {$res != 0} {
-        if {! [installtest_p]} {
-            # build as user in the source tree
-            verbose -log "exec make -C $uprobes"
-            set res [catch "exec make -C $uprobes" output]
-            verbose -log "OUT $output"
-            verbose -log "RC $res"
-        } else {
-            # build as root in the installed location
-            set res [as_root "make -C $uprobes"]
-        }
+        # build as user at $uprobes which will be the source
+	# tree for 'make check' and the install tree for
+	# 'make installcheck'.
+	verbose -log "exec make -C $uprobes"
+	set res [catch "exec make -C $uprobes" output]
+	verbose -log "OUT $output"
+	verbose -log "RC $res"
     }
     if {$res == 0} { return 1 } else { return 0 }
 }