From 3526e29ed13645927bf5a1d3f0f36e5fc7d0a39a Mon Sep 17 00:00:00 2001 From: dsmith Date: Mon, 30 Oct 2006 15:24:44 +0000 Subject: 2006-10-30 David Smith * systemtap.base/cache.exp: Saves value of SYSTEMTAP_DIR environment variable before starting tests and restores value at the end. Without this caching was broken for the rest of the testsuite, since all cached files were ending up in testsuite/.cache_test (which gets deleted on the next run of the testsuite). * Makefile.am: The 'clean-local' target now removes the .systemtap and .cache_test directories. * Makefile.in: Regenerated. --- testsuite/systemtap.base/cache.exp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'testsuite/systemtap.base') diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp index 7308fafc..439898ab 100644 --- a/testsuite/systemtap.base/cache.exp +++ b/testsuite/systemtap.base/cache.exp @@ -64,6 +64,9 @@ proc stap_compile { TEST_NAME flags script args } { # systemtap directory and cache set local_systemtap_dir [exec pwd]/.cache_test exec /bin/rm -rf $local_systemtap_dir +if [info exists env(SYSTEMTAP_DIR)] { + set old_systemtap_dir $env(SYSTEMTAP_DIR) +} set env(SYSTEMTAP_DIR) $local_systemtap_dir # Set up the scripts we'll use. @@ -108,3 +111,8 @@ stap_compile BASIC4 [F_CACHED_COMPILE] $basic_script2 # Cleanup. exec /bin/rm -rf $local_systemtap_dir +if [info exists old_systemtap_dir] { + set env(SYSTEMTAP_DIR) $old_systemtap_dir +} else { + unset env(SYSTEMTAP_DIR) +} -- cgit