Merge branch 'master' of git://sources.redhat.com/git/systemtap

5 files changed, 20 insertions, 20 deletions

diff --git a/testsuite/systemtap.printf/end1b.exp b/testsuite/systemtap.printf/end1b.exp
index b1b75c52..6168f66e 100644
--- a/testsuite/systemtap.printf/end1b.exp
+++ b/testsuite/systemtap.printf/end1b.exp
@@ -24,24 +24,24 @@ if {[catch {exec mktemp -t staptestXXXXX} tmpfile]} {
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
     untested $TEST_NAME
     puts "stap failed: $res"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/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 failed"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/bin/rm -f [glob ${tmpfile}*]}
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
     fail "$TEST_NAME failed"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/bin/rm -f [glob ${tmpfile}*]}
     return
 }
 
 pass "$TEST_NAME passed"
-catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+as_root {/bin/rm -f [glob ${tmpfile}*]}
 
diff --git a/testsuite/systemtap.printf/mixed_outb.exp b/testsuite/systemtap.printf/mixed_outb.exp
index 9d1be4c6..6d352dd4 100644
--- a/testsuite/systemtap.printf/mixed_outb.exp
+++ b/testsuite/systemtap.printf/mixed_outb.exp
@@ -24,24 +24,24 @@ if {[catch {exec mktemp -t staptestXXXXX} tmpfile]} {
 if {[catch {exec stap -DMAXACTION=100000 -b -o $tmpfile $test} res]} {
     untested $TEST_NAME
     puts "stap failed: $res"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/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 failed"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/bin/rm -f [glob ${tmpfile}*]}
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
     fail "$TEST_NAME failed"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/bin/rm -f [glob ${tmpfile}*]}
     return
 }
 
 pass "$TEST_NAME passed"
-catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+as_root {/bin/rm -f [glob ${tmpfile}*]}
 
diff --git a/testsuite/systemtap.printf/out1b.exp b/testsuite/systemtap.printf/out1b.exp
index 0242dee6..723238c5 100644
--- a/testsuite/systemtap.printf/out1b.exp
+++ b/testsuite/systemtap.printf/out1b.exp
@@ -24,24 +24,24 @@ if {[catch {exec mktemp -t staptestXXXXX} tmpfile]} {
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
     untested $TEST_NAME
     puts "stap failed: $res"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/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 failed"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/bin/rm -f [glob ${tmpfile}*]}
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
     fail "$TEST_NAME failed"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/bin/rm -f [glob ${tmpfile}*]}
     return
 }
 
 pass "$TEST_NAME passed"
-catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+as_root {/bin/rm -f [glob ${tmpfile}*]}
 
diff --git a/testsuite/systemtap.printf/out2b.exp b/testsuite/systemtap.printf/out2b.exp
index be050854..085cfa14 100644
--- a/testsuite/systemtap.printf/out2b.exp
+++ b/testsuite/systemtap.printf/out2b.exp
@@ -24,24 +24,24 @@ if {[catch {exec mktemp -t staptestXXXXX} tmpfile]} {
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
     untested $TEST_NAME
     puts "stap failed: $res"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/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 failed"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/bin/rm -f [glob ${tmpfile}*]}
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
     fail "$TEST_NAME failed"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/bin/rm -f [glob ${tmpfile}*]}
     return
 }
 
 pass "$TEST_NAME passed"
-catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+as_root {/bin/rm -f [glob ${tmpfile}*]}
 
diff --git a/testsuite/systemtap.printf/out3b.exp b/testsuite/systemtap.printf/out3b.exp
index 2d2b3d0b..395363fc 100644
--- a/testsuite/systemtap.printf/out3b.exp
+++ b/testsuite/systemtap.printf/out3b.exp
@@ -24,24 +24,24 @@ if {[catch {exec mktemp -t staptestXXXXX} tmpfile]} {
 if {[catch {exec stap -DMAXACTION=100000 -b -o $tmpfile $test} res]} {
     untested $TEST_NAME
     puts "stap failed: $res"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/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 failed"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/bin/rm -f [glob ${tmpfile}*]}
     return
 }
 
 if {[catch {exec cmp $tmpfile $srcdir/$subdir/large_output} res]} {
     puts "$res"
     fail "$TEST_NAME failed"
-    catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+    as_root {/bin/rm -f [glob ${tmpfile}*]}
     return
 }
 
 pass "$TEST_NAME passed"
-catch {eval [list exec sudo /bin/rm -f] [glob ${tmpfile}*]}
+as_root {/bin/rm -f [glob ${tmpfile}*]}