diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 4 |
4 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2012-04-08 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (valgrind): Define VALGRIND instead of redefining AWK. + This allows test/Makefile.am to set up the command environment as + desired. + (valgrind-noleak): Ditto, plus set --leak-check=no instead of the + default summary setting. + 2012-04-07 Andrew J. Schorr <aschorr@telemetry-investments.com> * TODO.xgawk: Update to reflect progress. diff --git a/Makefile.am b/Makefile.am index d1bf1e65..5c37dcda 100644 --- a/Makefile.am +++ b/Makefile.am @@ -210,10 +210,10 @@ diffout valgrind-scan: valgrind: cd test; rm -f log.[0-9]*; \ - make check AWK="valgrind --leak-check=full --log-file=log.%p ../gawk"; \ + make check VALGRIND="valgrind --leak-check=full --log-file=log.%p"; \ make valgrind-scan valgrind-noleak: cd test; rm -f log.[0-9]*; \ - make check AWK="valgrind --log-file=log.%p ../gawk"; \ + make check VALGRIND="valgrind --leak-check=no --log-file=log.%p"; \ make valgrind-scan diff --git a/test/ChangeLog b/test/ChangeLog index 4d4d5557..136e9658 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2012-04-08 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (AWK, PGAWK): Include new $(VALGRIND) variable in + command line (now passed in by top-level Makefile). + 2012-04-07 Andrew J. Schorr <aschorr@telemetry-investments.com> * Makefile.am (ordchr2, readfile): Fix so "make diffout" will work diff --git a/test/Makefile.am b/test/Makefile.am index 4ed867d4..cb920550 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -880,8 +880,8 @@ PGAWKPROG = ../pgawk$(EXEEXT) # check things specifically not in the C locale. # # And we set AWKLIBPATH to find the extension libraries we built. -AWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} AWKLIBPATH=../extension/.libs $(AWKPROG) -PGAWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} AWKLIBPATH=../extension/.libs $(PGAWKPROG) +AWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} AWKLIBPATH=../extension/.libs $(VALGRIND) $(AWKPROG) +PGAWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} AWKLIBPATH=../extension/.libs $(VALGRIND) $(PGAWKPROG) # Message stuff is to make it a little easier to follow. # Make the pass-fail last and dependent on others to avoid |