diff options
| author | dsmith <dsmith> | 2006-10-30 15:24:44 +0000 |
|---|---|---|
| committer | dsmith <dsmith> | 2006-10-30 15:24:44 +0000 |
| commit | 3526e29ed13645927bf5a1d3f0f36e5fc7d0a39a (patch) | |
| tree | 6e6a8075a573c362008334b48c4ab9596392f2f4 | |
| parent | b3481c14e523c266c29e97345899b72cd73dee7b (diff) | |
| download | systemtap-steved-3526e29ed13645927bf5a1d3f0f36e5fc7d0a39a.tar.gz systemtap-steved-3526e29ed13645927bf5a1d3f0f36e5fc7d0a39a.tar.xz systemtap-steved-3526e29ed13645927bf5a1d3f0f36e5fc7d0a39a.zip | |
2006-10-30 David Smith <dsmith@redhat.com>
* 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.
| -rw-r--r-- | testsuite/ChangeLog | 13 | ||||
| -rw-r--r-- | testsuite/Makefile.am | 1 | ||||
| -rw-r--r-- | testsuite/Makefile.in | 1 | ||||
| -rw-r--r-- | testsuite/systemtap.base/cache.exp | 8 |
4 files changed, 23 insertions, 0 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 7ac1f2f2..0584f7d6 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2006-10-30 David Smith <dsmith@redhat.com> + + * 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. + 2006-10-30 Martin Hunt <hunt@redhat.com> * systemtap.base/cache.exp (stap_compile): Fix a simple diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 54d1bf57..a4f9f7a7 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -10,6 +10,7 @@ all-local: clean-local: @rm -f ./stap site.exp systemtap.sum systemtap.log + @rm -rf .systemtap .cache_test check-local: diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index fc2d0ee3..b42ab5f9 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -338,6 +338,7 @@ all-local: clean-local: @rm -f ./stap site.exp systemtap.sum systemtap.log + @rm -rf .systemtap .cache_test check-local: 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) +} |