Remove as_root calls from the printf testsuite

Once upon a time, we would use sudo staprun, and so output files from
"-o" were owned by root.  For a while now we've used a setuid staprun
instead, and the output files are created by stapio as the user.  Thus,
we don't need as_root to remove those files anymore.

* testsuite/systemtap.printf/end1b.exp: Clean up without as_root.
* testsuite/systemtap.printf/mixed_outb.exp: Ditto.
* testsuite/systemtap.printf/out1b.exp: Ditto.
* testsuite/systemtap.printf/out2b.exp: Ditto.
* testsuite/systemtap.printf/out3b.exp: Ditto.

diff --git a/testsuite/systemtap.printf/end1b.exp b/testsuite/systemtap.printf/end1b.exp
index 46cdc9c77305ab9fa36ff20fafbad889436317a2..c3c9d4cf20613f744c723abe2ebdaf6611bc7417 100644 (file)
--- a/testsuite/systemtap.printf/end1b.exp
+++ b/testsuite/systemtap.printf/end1b.exp
@@ -18,24 +18,24 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
     puts "stap failed: $res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 if {[catch {eval [list exec $stap_merge_path -o $tmpfile] [glob "${tmpfile}_*"]} res]} {
     puts "merge failed: $res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 pass $TEST_NAME
-as_root "/bin/rm -f [glob ${tmpfile}*]"
+eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
 

diff --git a/testsuite/systemtap.printf/mixed_outb.exp b/testsuite/systemtap.printf/mixed_outb.exp
index c15520b146c909ff679d612fab20d8374f4fb0b5..1225f9ce52c640197a67b8fc1984d27f2b82986f 100644 (file)
--- a/testsuite/systemtap.printf/mixed_outb.exp
+++ b/testsuite/systemtap.printf/mixed_outb.exp
@@ -18,24 +18,24 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 if {[catch {exec stap -DMAXACTION=100000 -b -o $tmpfile $test} res]} {
     fail $TEST_NAME
     puts "stap failed: $res"
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 if {[catch {eval [list exec $stap_merge_path -o $tmpfile] [glob "${tmpfile}_*"]} res]} {
     puts "merge failed: $res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 pass $TEST_NAME
-as_root "/bin/rm -f [glob ${tmpfile}*]"
+eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
 

diff --git a/testsuite/systemtap.printf/out1b.exp b/testsuite/systemtap.printf/out1b.exp
index 24efbf4cf39a492c9f10512595d0e4e10eabe20b..d09dadef8d35807442317e64c61398f0ac6d4b56 100644 (file)
--- a/testsuite/systemtap.printf/out1b.exp
+++ b/testsuite/systemtap.printf/out1b.exp
@@ -18,24 +18,24 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
     fail $TEST_NAME
     puts "stap failed: $res"
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 if {[catch {eval [list exec $stap_merge_path -o $tmpfile] [glob "${tmpfile}_*"]} res]} {
     puts "merge failed: $res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 pass $TEST_NAME
-as_root "/bin/rm -f [glob ${tmpfile}*]"
+eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
 

diff --git a/testsuite/systemtap.printf/out2b.exp b/testsuite/systemtap.printf/out2b.exp
index 70a98ea2db8edd2a28322133edc693640e9eb13c..bb732c42e57dfd3a18877816d1aa79af137d9235 100644 (file)
--- a/testsuite/systemtap.printf/out2b.exp
+++ b/testsuite/systemtap.printf/out2b.exp
@@ -18,24 +18,24 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
     fail $TEST_NAME
     puts "stap failed: $res"
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 if {[catch {eval [list exec $stap_merge_path -o $tmpfile] [glob "${tmpfile}_*"]} res]} {
     puts "merge failed: $res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 pass $TEST_NAME
-as_root "/bin/rm -f [glob ${tmpfile}*]"
+eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
 

diff --git a/testsuite/systemtap.printf/out3b.exp b/testsuite/systemtap.printf/out3b.exp
index d49625e9c4935aed8134acd9c14104cd8d5b2cab..5d82512a221a8588d32a4fbea3d8e9859dbfaf0f 100644 (file)
--- a/testsuite/systemtap.printf/out3b.exp
+++ b/testsuite/systemtap.printf/out3b.exp
@@ -18,24 +18,24 @@ if {[catch {exec mktemp -t staptestXXXXXX} tmpfile]} {
 if {[catch {exec stap -DMAXACTION=100000 -b -o $tmpfile $test} res]} {
     fail $TEST_NAME
     puts "stap failed: $res"
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 if {[catch {eval [list exec $stap_merge_path -o $tmpfile] [glob "${tmpfile}_*"]} res]} {
     puts "merge failed: $res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
     fail $TEST_NAME
-    as_root "/bin/rm -f [glob ${tmpfile}*]"
+    eval [list exec /bin/rm -f] [glob "${tmpfile}*"]
     return
 }
 
 pass $TEST_NAME
-as_root "/bin/rm -f [glob ${tmpfile}*]"
+eval [list exec /bin/rm -f] [glob "${tmpfile}*"]