summaryrefslogtreecommitdiffstats
path: root/testsuite/lib/systemtap.exp
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2008-05-28 08:17:42 -0400
committerFrank Ch. Eigler <fche@elastic.org>2008-05-28 08:17:42 -0400
commit9319dbe79bfc893bc7f7e35938151a01bb8a2d32 (patch)
treeb56d3bfe79c05991d1ef1990b4039a4a71db2dc1 /testsuite/lib/systemtap.exp
parent8404e6184256e2d580cbd1c97cb5859c625b99f7 (diff)
parent0fbf54d628c9fd4257dbcf2e43c5657c0818be09 (diff)
downloadsystemtap-steved-9319dbe79bfc893bc7f7e35938151a01bb8a2d32.tar.gz
systemtap-steved-9319dbe79bfc893bc7f7e35938151a01bb8a2d32.tar.xz
systemtap-steved-9319dbe79bfc893bc7f7e35938151a01bb8a2d32.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
* 'master' of ssh://sources.redhat.com/git/systemtap: Create user based cache dir in testsuite. Refresh cscope.files. Add prototypes for using the 2.6.26 probe_kernel_* functions.
Diffstat (limited to 'testsuite/lib/systemtap.exp')
-rw-r--r--testsuite/lib/systemtap.exp5
1 files changed, 3 insertions, 2 deletions
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index d458e98f..0f6a69dd 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} {