2006-10-27 Martin Hunt <hunt@redhat.com>

	* test.exp, test.tcl: Remove our own caching code
	and just use systemtap's new caching.

	* acct.c (main): Make pattern less selective so
	it works when run by root.

1 files changed, 2 insertions, 18 deletions

diff --git a/testsuite/systemtap.syscall/test.tcl b/testsuite/systemtap.syscall/test.tcl
index ee797565..41934da4 100755
--- a/testsuite/systemtap.syscall/test.tcl
+++ b/testsuite/systemtap.syscall/test.tcl
@@ -14,7 +14,7 @@ proc cleanup {} {
 }
 
 proc usage {progname} {
-    puts "Usage: $progname testname [modulename]"
+    puts "Usage: $progname testname"
 }
 
 proc bgerror {error} {
@@ -23,29 +23,13 @@ proc bgerror {error} {
 }
 trap {cleanup} SIGINT
 set testname [lindex $argv 0]
-set modname [lindex $argv 1]
 
 if {$testname == ""} {
     usage $argv0
     exit
 }
 set filename "${testname}.c"
-
-if {$modname == ""} {
-    set cmd "stap -c ../${testname} ../sys.stp"
-} else {
-    set ccmd "which staprun"
-    catch {eval exec $ccmd} output
-    if {[file exists $output]} {
-	set staprun $output
-    } else {
-	puts "staprun not found!"
-	exit
-    }
-
-    set user $::tcl_platform(user)
-    set cmd "sudo $staprun -rmq  -u $user -c ../${testname} ${modname}"
-}
+set cmd "stap -c ../${testname} ../sys.stp"
 
 # Extract the expected results
 # Use the preprocessor so we can ifdef tests in and out