From 2720291460e1e211be215fddb8096e3ed1d9bb28 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Fri, 13 Oct 2006 23:54:24 +0000 Subject: Use $(VALGRIND) when running programs using $(KRB5_RUN_ENV) or $(RUN_SETUP). Replaces old hack with MAYBE_VALGRIND added to RUN_ENV in a way that would break in some of the tests. Set VALGRIND in site.exp in tests/dejagnu. (Not used yet.) Runs some shell scripts under valgrind, rather than changing them to run only the executables under valgrind; this is mostly okay, just creates lots of extra log data, and requires --trace-children=yes. This should work for any instrumentation program invocation that gets followed immediately by the name and argument list for the program being instrumented. For example, VALGRIND="env LD_PRELOAD=..." should work, though I haven't tested it. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18699 dc483132-0cff-0310-8789-dd5450dbe970 --- src/config/pre.in | 4 +--- src/config/shlib.conf | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/config') diff --git a/src/config/pre.in b/src/config/pre.in index 47f8c67f7..2c4c0298d 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -550,9 +550,7 @@ 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 +VALGRIND= # valgrind --tool=memcheck --log-file=$(BUILDTOP)/valgrind.out --trace-children=yes -v --leak-check=yes # AUTOCONF_HEADER=$(SRCTOP)/include/autoconf.h.in diff --git a/src/config/shlib.conf b/src/config/shlib.conf index aeaff706b..5e92e0e49 100644 --- a/src/config/shlib.conf +++ b/src/config/shlib.conf @@ -374,7 +374,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; $(MAYBE_VALGRIND)' + RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH; ' ## old version: # Linux libc does weird stuff at shlib link time, must be -- cgit