summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2006-03-16 01:29:26 +0000
committerKen Raeburn <raeburn@mit.edu>2006-03-16 01:29:26 +0000
commit4b0eadb78af87eb93ab227cd73e361fc5e497a65 (patch)
treea0e58f91f6c63880a8f58a922978366fd7c70403 /src
parent5fc02dc6d9efc065cb6b95ef3246d968dc2a8e32 (diff)
downloadkrb5-4b0eadb78af87eb93ab227cd73e361fc5e497a65.tar.gz
krb5-4b0eadb78af87eb93ab227cd73e361fc5e497a65.tar.xz
krb5-4b0eadb78af87eb93ab227cd73e361fc5e497a65.zip
Quick hack to make it easy to run valgrind on many of our test cases.
Notably, though, the dejagnu tests will not include valgrind. * pre.in (MAYBE_VALGRIND): New variable. * shlib.conf (*-*-linux*): Use it in RUN_ENV. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17742 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/config/ChangeLog5
-rw-r--r--src/config/pre.in4
-rw-r--r--src/config/shlib.conf2
3 files changed, 9 insertions, 2 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 481de61ad..b14a4ce06 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-15 Ken Raeburn <raeburn@mit.edu>
+
+ * pre.in (MAYBE_VALGRIND): New variable.
+ * shlib.conf (*-*-linux*): Use it in RUN_ENV.
+
2006-03-11 Ken Raeburn <raeburn@mit.edu>
* pre.in (KRB_INCLUDES): Drop include/krb5 directories.
diff --git a/src/config/pre.in b/src/config/pre.in
index 02aa75461..de7f6d455 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -546,7 +546,9 @@ PROFFLAGS=@PROFFLAGS@
# platform-dependent temporary files that should get cleaned up
EXTRA_FILES=@EXTRA_FILES@
-
+# The "env" at the end is because sometimes we add local environment
+# variable settings with "@RUN_ENV@ KRB5_CONFIG=foo ..."
+MAYBE_VALGRIND= # valgrind --tool=memcheck --log-file=$(BUILDTOP)/valgrind.out --trace-children=yes -v --leak-check=yes env
##
## end of pre.in
diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 744d7ea05..cc914577d 100644
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -360,7 +360,7 @@ mips-*-netbsd*)
RPATH_FLAG='-Wl,-rpath -Wl,'
CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)'
CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
- RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
+ RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH; $(MAYBE_VALGRIND)'
## old version:
# Linux libc does weird stuff at shlib link time, must be