diff options
| -rw-r--r-- | testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | testsuite/Makefile.am | 2 | ||||
| -rw-r--r-- | testsuite/lib/systemtap.exp | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.base/cache.exp | 5 |
4 files changed, 16 insertions, 5 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index f5f51fad..d49d777f 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2008-05-28 Mark Wielaard <mwielaard@redhat.com> + + * lib/systemtap.exp (setup_systemtap_environment): Create user + based cache dir. + * systemtap.base/cache.exp: Likewise. + * Makefile.am (clean-local): Try to remove all .systemtap and + .cache_test dirs. + + 2008-05-27 Frank Ch. Eigler <fche@elastic.org> * lib/systemtap.exp (closewait): New proc for aggressive child diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 2602a162..fe089f50 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -9,7 +9,7 @@ all-local: clean-local: -rm -f ./stap site.exp systemtap.sum systemtap.log - -rm -rf .systemtap .cache_test 2>/dev/null + -rm -rf .systemtap* .cache_test* 2>&1 /dev/null DEJAZILLA=@dejazilla@ diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index 4586ee20..74fcc7af 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -38,8 +38,9 @@ proc setup_systemtap_environment {} { set env(SRCDIR) $srcdir/.. } - # Use a local systemtap directory and cache - set env(SYSTEMTAP_DIR) [exec pwd]/.systemtap + # Use a local systemtap directory and cache. Add user name so + # make check and sudo make check don't clobber each other. + set env(SYSTEMTAP_DIR) [exec pwd]/.systemtap-[exec whoami] # PATH, SYSTEMTAP_TAPSET, SYSTEMTAP_RUNTIME, LD_LIBRARY_PATH are already set. foreach var {PATH STAP SRCDIR SYSTEMTAP_TAPSET SYSTEMTAP_RUNTIME SYSTEMTAP_DIR LD_LIBRARY_PATH} { diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp index a908910a..cae45fe2 100644 --- a/testsuite/systemtap.base/cache.exp +++ b/testsuite/systemtap.base/cache.exp @@ -64,8 +64,9 @@ proc stap_compile { TEST_NAME flags script args } { } # Since we need a clean cache directory, we'll use a temporary -# systemtap directory and cache -set local_systemtap_dir [exec pwd]/.cache_test +# systemtap directory and cache (add user name so make check and +# sudo make installcheck don't clobber each others) +set local_systemtap_dir [exec pwd]/.cache_test-[exec whoami] exec /bin/rm -rf $local_systemtap_dir if [info exists env(SYSTEMTAP_DIR)] { set old_systemtap_dir $env(SYSTEMTAP_DIR) |