summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Smith <dsmith@redhat.com>2009-02-20 11:09:13 -0600
committerDavid Smith <dsmith@redhat.com>2009-02-20 11:09:13 -0600
commita972819ab1954fe33500079d19dcb29c786a1976 (patch)
tree71a4e18acb323f714a9454556d058c24958425c4
parentadc67597f327cd43d58b1d0cb740dab14a75a058 (diff)
downloadsystemtap-steved-a972819ab1954fe33500079d19dcb29c786a1976.tar.gz
systemtap-steved-a972819ab1954fe33500079d19dcb29c786a1976.tar.xz
systemtap-steved-a972819ab1954fe33500079d19dcb29c786a1976.zip
Better testcase cleanup.
2009-02-20 David Smith <dsmith@redhat.com> * systemtap.base/cache.exp (stap_compile): Better cleanup. * static_uprobes.exp: Ditto.
-rw-r--r--testsuite/systemtap.base/cache.exp1
-rw-r--r--testsuite/systemtap.base/static_uprobes.exp5
2 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp
index 390af054..b10a4f28 100644
--- a/testsuite/systemtap.base/cache.exp
+++ b/testsuite/systemtap.base/cache.exp
@@ -116,6 +116,7 @@ set env(SYSTEMTAP_DIR) /dev/null
stap_compile DISABLED1 [F_UNCACHED_COMPILE] $basic_script1
stap_compile DISABLED2 [F_UNCACHED_COMPILE] $basic_script1
set env(SYSTEMTAP_DIR) $local_systemtap_dir
+eval [list exec /bin/rm -f] [glob "stap_*.ko"]
# Disable the cache with '-m'
stap_compile MODNAM1 [F_UNCACHED_COMPILE] $basic_script1 -m modnam
diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp
index 11fec9b1..c76d4805 100644
--- a/testsuite/systemtap.base/static_uprobes.exp
+++ b/testsuite/systemtap.base/static_uprobes.exp
@@ -88,6 +88,7 @@ if {[installtest_p]} {
if {[catch {exec $dtrace -h -s $sup_dpath} res]} {
verbose -log "unable to run $dtrace: $res"
}
+catch {exec rm -f $sup_dpath}
if {[file exists $sup_hpath]} then {
pass "$test generating header"
} else {
@@ -96,8 +97,6 @@ if {[file exists $sup_hpath]} then {
return
}
-catch {exec rm -f $sup_dpath}
-
if {[installtest_p]} {
set sdtdir $env(SYSTEMTAP_INCLUDES)
} else {
@@ -186,4 +185,4 @@ if {$ok == 4} { pass "$test C++" } { fail "$test C++ ($ok)" }
# catch {exec rm -f $sup_srcpath $sup_exepath $supcplus_exepath $sup_hpath $sup_stppath}
# It's not so important to clean up, and it's unhelpful if
-# one needs to diagnose a test failure. \ No newline at end of file
+# one needs to diagnose a test failure.