diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 14 | ||||
| -rw-r--r-- | test/Makefile.in | 10 |
3 files changed, 18 insertions, 12 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 89d10028..abab6f21 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2013-01-31 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am: To decide whether to run MPFR tests, use the output + of gawk --version instead of the automake TEST_MPFR conditional (which + has now been removed from configure.ac). + 2013-01-27 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (EXTRA_DIST): Add all the mpfr test files. Duh. diff --git a/test/Makefile.am b/test/Makefile.am index c8a67d19..6c7eb147 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1024,12 +1024,6 @@ VALGRIND = # And we set AWKLIBPATH to find the extension libraries we built. AWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} AWKLIBPATH=../extension/.libs $(VALGRIND) $(AWKPROG) -if TEST_MPFR -CHECKMPFR = mpfr-msg-start mpfr-tests mpfr-msg-end -else -CHECKMPFR = -endif - # Message stuff is to make it a little easier to follow. # Make the pass-fail last and dependent on others to avoid # spurious errors if `make -j' in effect. @@ -1041,7 +1035,7 @@ check: msg \ machine-msg-start machine-tests machine-msg-end \ charset-msg-start charset-tests charset-msg-end \ shlib-msg-start shlib-tests shlib-msg-end \ - $(CHECKMPFR) + mpfr-msg-start mpfr-tests mpfr-msg-end @$(MAKE) pass-fail basic: $(BASIC_TESTS) @@ -1058,7 +1052,11 @@ inet: inetmesg $(INET_TESTS) machine-tests: $(MACHINE_TESTS) -mpfr-tests: $(MPFR_TESTS) +mpfr-tests: + @if $(AWK) --version | $(AWK) '/MPFR/ { exit 1 }' ; then \ + echo MPFR tests not supported on this system ; \ + else $(MAKE) $(MPFR_TESTS) ; \ + fi shlib-tests: @if grep 'DYNAMIC 1' $(top_builddir)/config.h > /dev/null ; then \ diff --git a/test/Makefile.in b/test/Makefile.in index ba26b6aa..0e63c6b1 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1223,8 +1223,6 @@ AWKPROG = ../gawk$(EXEEXT) # Default for VALGRIND is empty unless overridden by a command-line argument. # This protects against cruft in the environment. VALGRIND = -@TEST_MPFR_FALSE@CHECKMPFR = -@TEST_MPFR_TRUE@CHECKMPFR = mpfr-msg-start mpfr-tests mpfr-msg-end all: all-am .SUFFIXES: @@ -1420,7 +1418,7 @@ check: msg \ machine-msg-start machine-tests machine-msg-end \ charset-msg-start charset-tests charset-msg-end \ shlib-msg-start shlib-tests shlib-msg-end \ - $(CHECKMPFR) + mpfr-msg-start mpfr-tests mpfr-msg-end @$(MAKE) pass-fail basic: $(BASIC_TESTS) @@ -1437,7 +1435,11 @@ inet: inetmesg $(INET_TESTS) machine-tests: $(MACHINE_TESTS) -mpfr-tests: $(MPFR_TESTS) +mpfr-tests: + @if $(AWK) --version | $(AWK) '/MPFR/ { exit 1 }' ; then \ + echo MPFR tests not supported on this system ; \ + else $(MAKE) $(MPFR_TESTS) ; \ + fi shlib-tests: @if grep 'DYNAMIC 1' $(top_builddir)/config.h > /dev/null ; then \ |