[gawk-diffs] [SCM] gawk branch, xgawk-build, updated. 7a566d8be209d0f283e3d2afa2e5637cf316dde7

[Andrew J. Schorr]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, xgawk-build has been updated
       via  7a566d8be209d0f283e3d2afa2e5637cf316dde7 (commit)
      from  266864e87a5f500d0c3b570cb489e040ae69a3b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=7a566d8be209d0f283e3d2afa2e5637cf316dde7

commit 7a566d8be209d0f283e3d2afa2e5637cf316dde7
Author: Andrew J. Schorr <address@hidden>
Date:   Sun Apr 8 09:57:04 2012 -0400

    Fix valgrind targets to respect environment settings and work with for 
shared library tests.

diff --git a/ChangeLog b/ChangeLog
index 16febe5..4a0360a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-04-08         Andrew J. Schorr     <address@hidden>
+
+       * 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     <address@hidden>
 
        * TODO.xgawk: Update to reflect progress.
diff --git a/Makefile.am b/Makefile.am
index d1bf1e6..5c37dcd 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/Makefile.in b/Makefile.in
index ad79506..537e2ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1117,12 +1117,12 @@ 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
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/test/ChangeLog b/test/ChangeLog
index 4d4d555..136e965 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-08         Andrew J. Schorr     <address@hidden>
+
+       * Makefile.am (AWK, PGAWK): Include new $(VALGRIND) variable in
+       command line (now passed in by top-level Makefile).
+
 2012-04-07         Andrew J. Schorr     <address@hidden>
 
        * Makefile.am (ordchr2, readfile): Fix so "make diffout" will work
diff --git a/test/Makefile.am b/test/Makefile.am
index 4ed867d..cb92055 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
diff --git a/test/Makefile.in b/test/Makefile.in
index 9354abc..38fd231 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -98,7 +98,7 @@ AUTOMAKE = @AUTOMAKE@
 # 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)
+AWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} 
AWKLIBPATH=../extension/.libs $(VALGRIND) $(AWKPROG)
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -1079,7 +1079,7 @@ GENTESTS_UNUSED = Makefile.in gtlnbufv.awk printfloat.awk
 CMP = cmp
 AWKPROG = ../gawk$(EXEEXT)
 PGAWKPROG = ../pgawk$(EXEEXT)
-PGAWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} 
AWKLIBPATH=../extension/.libs $(PGAWKPROG)
+PGAWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} 
AWKLIBPATH=../extension/.libs $(VALGRIND) $(PGAWKPROG)
 all: all-am
 
 .SUFFIXES:

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    8 ++++++++
 Makefile.am      |    4 ++--
 Makefile.in      |    4 ++--
 test/ChangeLog   |    5 +++++
 test/Makefile.am |    4 ++--
 test/Makefile.in |    4 ++--
 6 files changed, 21 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
gawk