Add better cleanup to a setjmp.exp and statement.exp.

* testsuite/systemtap.base/setjmp.exp: Cleanup test programs. Allow the
  user to override this using the '-v' vebose flag.
* testsuite/systemtap.base/statement.exp: Ditto.

diff --git a/testsuite/systemtap.base/setjmp.exp b/testsuite/systemtap.base/setjmp.exp
index efa91ce5c08d2c43447acf6349ad75d7beaa0ce1..b0bf6aaf053096d8f763263b7c3c050dfa5c3f53 100644 (file)
--- a/testsuite/systemtap.base/setjmp.exp
+++ b/testsuite/systemtap.base/setjmp.exp
@@ -55,3 +55,6 @@ foreach variant [list "" "-DSIGJMP" "-DUNDERJMP"] {
        }
     }
 }
+if { $verbose == 0 } {
+    catch { eval [list exec /bin/rm -f] [glob "setjmp.exe*"] }
+}

diff --git a/testsuite/systemtap.base/statement.exp b/testsuite/systemtap.base/statement.exp
index 04227004e6a36016dbae5bab1cc4563dd39fabad..9315b8da5e24f35b6d70384c115b4e9134d736ea 100644 (file)
--- a/testsuite/systemtap.base/statement.exp
+++ b/testsuite/systemtap.base/statement.exp
@@ -23,7 +23,7 @@ if {![utrace_p]} {
        fail "$test -p2 ($probes)"
     }
 }
-exec rm -f $test
+if { $verbose == 0 } { catch { exec rm -f $test } }
 
 set test bz10294
 
@@ -66,7 +66,7 @@ if {![utrace_p]} {
     }
     wait
 }
-exec rm -f $test
+if { $verbose == 0 } { catch { exec rm -f $test } }
 
 
 set test bz14774
@@ -94,4 +94,4 @@ if {![utrace_p]} {
     catch { close }
     if { $hint == 1 && $probes >= 9 } then { pass "$test -p2" } else { fail "$test -p2 ($probes)" }
 }
-#exec rm -f $test
+if { $verbose == 0 } { catch { exec rm -f $test } }