2008-02-06 Masami Hiramatsu <mhiramat@redhat.com>

	* systemtap.base/procfs.exp: Added PROCFS.ko cleanup.
	* systemtap.context/context.exp: Added cleanup call.
	* systemtap.printf/end1b.exp: Passed evaluated command string to
	as_root.
	* systemtap.printf/mixed_outb.exp: Ditto.
	* systemtap.printf/out1b.exp: Ditto.
	* systemtap.printf/out2b.exp: Ditto.
	* systemtap.printf/out3b.exp: Ditto.

8 files changed, 34 insertions, 22 deletions

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 0f804ee0..3a4a24ab 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2008-02-06  Masami Hiramatsu  <mhiramat@redhat.com>
+
+	* systemtap.base/procfs.exp: Added PROCFS.ko cleanup.
+	* systemtap.context/context.exp: Added cleanup call.
+	* systemtap.printf/end1b.exp: Passed evaluated command string to
+	as_root.
+	* systemtap.printf/mixed_outb.exp: Ditto.
+	* systemtap.printf/out1b.exp: Ditto.
+	* systemtap.printf/out2b.exp: Ditto.
+	* systemtap.printf/out3b.exp: Ditto.
+
 2008-02-04  David Smith  <dsmith@redhat.com>
 
 	PR 4446.
diff --git a/testsuite/systemtap.base/procfs.exp b/testsuite/systemtap.base/procfs.exp
index ac00acc6..182f1e2e 100644
--- a/testsuite/systemtap.base/procfs.exp
+++ b/testsuite/systemtap.base/procfs.exp
@@ -110,3 +110,5 @@ set systemtap_script {
 # test procfs probes
 set output_string "\\mfinal value = goodbye\\M\r\n"
 stap_run $test proc_read_write $output_string -e $systemtap_script -m $test
+
+exec /bin/rm -f ${test}.ko
diff --git a/testsuite/systemtap.context/context.exp b/testsuite/systemtap.context/context.exp
index bc5f8ebe..472609f7 100644
--- a/testsuite/systemtap.context/context.exp
+++ b/testsuite/systemtap.context/context.exp
@@ -76,6 +76,5 @@ foreach test $testlist {
     source $test.tcl
 }
 
-
-
+cleanup
 
diff --git a/testsuite/systemtap.printf/end1b.exp b/testsuite/systemtap.printf/end1b.exp
index e23d6bc7..e28dce5b 100644
--- a/testsuite/systemtap.printf/end1b.exp
+++ b/testsuite/systemtap.printf/end1b.exp
@@ -18,24 +18,24 @@ if {[catch {exec mktemp -t staptestXXXXX} tmpfile]} {
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
     untested $TEST_NAME
     puts "stap failed: $res"
-    as_root {/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"
-    as_root {/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"
-    as_root {/bin/rm -f [glob ${tmpfile}*]}
+    as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
 pass "$TEST_NAME passed"
-as_root {/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 6f591c45..748dd0f2 100644
--- a/testsuite/systemtap.printf/mixed_outb.exp
+++ b/testsuite/systemtap.printf/mixed_outb.exp
@@ -18,24 +18,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"
-    as_root {/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"
-    as_root {/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"
-    as_root {/bin/rm -f [glob ${tmpfile}*]}
+    as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
 pass "$TEST_NAME passed"
-as_root {/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 0de48546..6edb8772 100644
--- a/testsuite/systemtap.printf/out1b.exp
+++ b/testsuite/systemtap.printf/out1b.exp
@@ -18,24 +18,24 @@ if {[catch {exec mktemp -t staptestXXXXX} tmpfile]} {
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
     untested $TEST_NAME
     puts "stap failed: $res"
-    as_root {/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"
-    as_root {/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"
-    as_root {/bin/rm -f [glob ${tmpfile}*]}
+    as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
 pass "$TEST_NAME passed"
-as_root {/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 883deedc..fc3301ab 100644
--- a/testsuite/systemtap.printf/out2b.exp
+++ b/testsuite/systemtap.printf/out2b.exp
@@ -18,24 +18,24 @@ if {[catch {exec mktemp -t staptestXXXXX} tmpfile]} {
 if {[catch {exec stap -b -o $tmpfile $test} res]} {
     untested $TEST_NAME
     puts "stap failed: $res"
-    as_root {/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"
-    as_root {/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"
-    as_root {/bin/rm -f [glob ${tmpfile}*]}
+    as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
 pass "$TEST_NAME passed"
-as_root {/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 dfafc170..af0d6be7 100644
--- a/testsuite/systemtap.printf/out3b.exp
+++ b/testsuite/systemtap.printf/out3b.exp
@@ -18,24 +18,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"
-    as_root {/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"
-    as_root {/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"
-    as_root {/bin/rm -f [glob ${tmpfile}*]}
+    as_root "/bin/rm -f [glob ${tmpfile}*]"
     return
 }
 
 pass "$TEST_NAME passed"
-as_root {/bin/rm -f [glob ${tmpfile}*]}
+as_root "/bin/rm -f [glob ${tmpfile}*]"