diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | test/ChangeLog | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 15 | ||||
| -rw-r--r-- | test/Makefile.in | 11 |
6 files changed, 47 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2012-12-27 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * configure.ac: Add MPFR test for use in test/Makefile.am. + 2013-01-25 Arnold D. Robbins <arnold@skeeve.com> * awkgram.y (parms_shadow): Change int param to bool. @@ -630,6 +630,8 @@ am__EXEEXT_TRUE LTLIBOBJS subdirs GAWKLIBEXT +TEST_MPFR_FALSE +TEST_MPFR_TRUE LIBMPFR LIBREADLINE SOCKET_LIBS @@ -10487,6 +10489,14 @@ $as_echo "#define HAVE_MPFR 1" >>confdefs.h unset _found_mpfr fi + if test -n "$LIBMPFR"; then + TEST_MPFR_TRUE= + TEST_MPFR_FALSE='#' +else + TEST_MPFR_TRUE='#' + TEST_MPFR_FALSE= +fi + ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then : @@ -11023,6 +11033,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${TEST_MPFR_TRUE}" && test -z "${TEST_MPFR_FALSE}"; then + as_fn_error $? "conditional \"TEST_MPFR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/configure.ac b/configure.ac index 4ba5f6aa..4beacd97 100644 --- a/configure.ac +++ b/configure.ac @@ -351,6 +351,7 @@ GAWK_CHECK_READLINE dnl check for mpfr support GNUPG_CHECK_MPFR +AM_CONDITIONAL([TEST_MPFR], [test -n "$LIBMPFR"]) dnl checks for structure members AC_STRUCT_ST_BLKSIZE diff --git a/test/ChangeLog b/test/ChangeLog index 47329fdf..3486817e 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2013-01-27 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am: Add mpfr tests if MPFR is available. + 2013-01-20 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (reginttrad): New test. diff --git a/test/Makefile.am b/test/Makefile.am index 98d82e7b..69bbfbf1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1011,6 +1011,12 @@ 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. @@ -1021,7 +1027,8 @@ check: msg \ extend-msg-start gawk-extensions extend-msg-end \ machine-msg-start machine-tests machine-msg-end \ charset-msg-start charset-tests charset-msg-end \ - shlib-msg-start shlib-tests shlib-msg-end + shlib-msg-start shlib-tests shlib-msg-end \ + $(CHECKMPFR) @$(MAKE) pass-fail basic: $(BASIC_TESTS) @@ -1094,6 +1101,12 @@ shlib-msg-start: shlib-msg-end: @echo "======== Done with shared library tests ========" +mpfr-msg-start: + @echo "======== Starting MPFR tests ========" + +mpfr-msg-end: + @echo "======== Done with MPFR tests ========" + lc_num1: @echo $@ diff --git a/test/Makefile.in b/test/Makefile.in index 1b986df2..2b154743 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1210,6 +1210,8 @@ 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: @@ -1404,7 +1406,8 @@ check: msg \ extend-msg-start gawk-extensions extend-msg-end \ machine-msg-start machine-tests machine-msg-end \ charset-msg-start charset-tests charset-msg-end \ - shlib-msg-start shlib-tests shlib-msg-end + shlib-msg-start shlib-tests shlib-msg-end \ + $(CHECKMPFR) @$(MAKE) pass-fail basic: $(BASIC_TESTS) @@ -1477,6 +1480,12 @@ shlib-msg-start: shlib-msg-end: @echo "======== Done with shared library tests ========" +mpfr-msg-start: + @echo "======== Starting MPFR tests ========" + +mpfr-msg-end: + @echo "======== Done with MPFR tests ========" + lc_num1: @echo $@ @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \ |