diff options
Diffstat (limited to 'pc')
-rw-r--r-- | pc/ChangeLog | 24 | ||||
-rw-r--r-- | pc/GenMakefileTst.awk | 2 | ||||
-rw-r--r-- | pc/Makefile | 11 | ||||
-rw-r--r-- | pc/Makefile.tst | 100 | ||||
-rw-r--r-- | pc/config.h | 6 |
5 files changed, 88 insertions, 55 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 65db8ac0..3253be06 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,27 @@ +2021-05-10 Arnold D. Robbins <arnold@skeeve.com> + + * GenMakefileTst.awk: Use ~ to match @echo line instead of ==, + gets things more right. Thanks to Manuel Collado for the + suggestion. + * Makefile.tst: Regenerated. + * Makefile (DYNOBJS): Add dynarray_at_failure$O and + dynarray_resize_clear$O. + +2021-05-09 Eli Zaretskii <eliz@gnu.org> + + * Makefile.tst (testext): Use $(CMP), not a literal "cmp", so that + end-of-line differences could be ignored on MS-DOS/Windows. + (argcasfile): Use ' /no/such/file', with a leading space, to avoid + MinGW thinking it's a file name, and converting it to C:\foo\bar. + test/argcasfile.ok adjusted accordingly. + + * Makefile (VPATH): Adapt to addition of support/malloc + directory. + (DYNOBJS): New list with dependencies of new files in + support/malloc. + (LIBOBJS): Add DYNOBJS. + (regex$O): Depend on some files in support/malloc. + 2021-05-05 Arnold D. Robbins <arnold@skeeve.com> * Makefile.tst: Rebuilt. diff --git a/pc/GenMakefileTst.awk b/pc/GenMakefileTst.awk index 298b3887..daa720c1 100644 --- a/pc/GenMakefileTst.awk +++ b/pc/GenMakefileTst.awk @@ -109,7 +109,7 @@ function print_recipe( i, start) return # First line if it's @echo $@ - if (recipe_lines[2] == "\t@echo $@") { + if (recipe_lines[2] ~ /\t@echo $@/) { start = 3 print recipe_lines[2] } else diff --git a/pc/Makefile b/pc/Makefile index beafd3d6..0dc8bb40 100644 --- a/pc/Makefile +++ b/pc/Makefile @@ -101,7 +101,7 @@ DO_LNK = $($(LNK)) DO_BIND= $($(BIND)) #------------------------------------------------------------------------ # To allow Make find files in the support subdirectory. -VPATH = .;./support +VPATH = .;./support;./support/malloc #======================================================================== # End of general configuration. Some platform-specific configuration # notes appear below. @@ -241,7 +241,10 @@ ALLOBJS = $(AWKOBJS) awkgram$O getid$O $(OBJ) # LIBOBJS # GNU and other stuff that gawk uses as library routines. -LIBOBJS= getopt$O getopt1$O dfa$O regex$O random$O localeinfo$O +DYNOBJS= dynarray_resize$O dynarray_emplace_enlarge$O dynarray_finalize$O \ + dynarray_at_failure$O dynarray_resize_clear$O + +LIBOBJS= getopt$O getopt1$O dfa$O random$O localeinfo$O regex$O $(DYNOBJS) GAWKOBJS = $(ALLOBJS) $(LIBOBJS) @@ -271,9 +274,11 @@ $(RSPFILE) : $(GAWKOBJS) # and we have -I. on the compiler command line. unistd.h is # included by awk.h. # 2. custom.h is not mentioned because pc ports don't use it. -$(ALLOBJS) $(LIBOBJS): \ +$(ALLOBJS) $(LIBOBJS) $(DYNOBJS): \ awk.h regex.h config.h gettext.h mbsupport.h protos.h dfa.h getopt.h nonposix.h +$(DYNOBJS) regex$O: dynarray.h libc-config.h malloc/dynarray.h malloc/dynarray-skeleton.c + builtin$O: floatmagic.h random.h popen.h random$O: random.h diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 89997816..ea4ec152 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -331,9 +331,10 @@ EXPECTED_FAIL_DJGPP = \ # List of tests that fail on MinGW EXPECTED_FAIL_MINGW = \ backbigs1 backsmalls1 clos1way6 devfd devfd1 devfd2 \ - errno exitval2 fork fork2 fts getfile getlnhd ignrcas3 inetdayt \ - inetecht mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 pid pipeio2 \ - pty1 pty2 readdir rstest4 rstest5 status-close timeout + errno exitval2 fmttest fork fork2 fts functab5 \ + getfile getlnhd hsprint ignrcas3 inetdayt inetecht inf-nan-torture \ + mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 \ + pid pipeio2 pty1 pty2 readdir rstest4 rstest5 status-close timeout # List of tests that fail on z/OS @@ -544,8 +545,8 @@ compare:: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ inftest:: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @echo This test is very machine specific... @$(AWK) -f "$(srcdir)"/inftest.awk | sed "s/inf/Inf/g" >_$@ || echo EXIT CODE: $$? >> _$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -578,8 +579,8 @@ strftime:: @-$(CMP) strftime.ok _$@ && rm -f _$@ strftime.ok || exit 0 devfd:: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @$(AWK) 1 /dev/fd/4 /dev/fd/5 4<"$(srcdir)"/devfd.in4 5<"$(srcdir)"/devfd.in5 >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@ || echo EXIT CODE: $$? >> _$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -600,8 +601,8 @@ tweakfld:: # AIX /bin/sh exec's the last command in a list, therefore issue a ":" # command so that pid.sh is fork'ed as a child before being exec'ed. pid:: - @echo $@ @echo Expect $@ to fail with DJGPP and MinGW. + @echo $@ @AWKPATH="$(srcdir)" AWK=$(AWKPROG) $(SHELL) "$(srcdir)"/pid.sh $$$$ > _`basename $@` ; : @-$(CMP) "$(srcdir)"/pid.ok _`basename $@` && rm -f _`basename $@` @@ -645,8 +646,8 @@ pipeio1:: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ pipeio2:: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @$(AWK) -v SRCDIR="$(srcdir)" -f "$(srcdir)"/pipeio2.awk >_$@ || echo EXIT CODE: $$? >> _$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -756,15 +757,15 @@ binmode1:: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ devfd1:: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @$(AWK) -f "$(srcdir)"/$@.awk 4< "$(srcdir)"/devfd.in1 5< "$(srcdir)"/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ # The program text is the '1' which will print each record. How compact can you get? devfd2:: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @$(AWK) 1 /dev/fd/4 /dev/fd/5 4< "$(srcdir)"/devfd.in1 5< "$(srcdir)"/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -891,8 +892,8 @@ mpfrmemok1: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ jarebug:: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @"$(srcdir)"/$@.sh "$(AWKPROG)" "$(srcdir)"/$@.awk "$(srcdir)"/$@.in "_$@" || echo EXIT CODE: $$? >> _$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -1036,19 +1037,19 @@ testext:: @echo $@ @$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum'; \ - then cmp "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \ - else cmp "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi + @-if echo "$$GAWK_TEST_ARGS" | egrep -e '-M|--bignum' > /dev/null; \ + then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \ + else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi getfile: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -v TESTEXT_QUIET=1 -ltestext -f $@.awk < $(srcdir)/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ readdir: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @if [ "`uname`" = Linux ] && [ "`stat -f . 2>/dev/null | awk 'NR == 2 { print $$NF }'`" = nfs ]; then \ echo This test may fail on GNU/Linux systems when run on NFS or JFS filesystems.; \ echo If it does, try rerunning on an ext'[234]' filesystem. ; \ @@ -1073,8 +1074,8 @@ readdir_retest: @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @case `uname` in \ IRIX) \ echo This test may fail on IRIX systems when run on an NFS filesystem.; \ @@ -1095,8 +1096,8 @@ charasbytes: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ symtab6: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -1152,8 +1153,8 @@ watchpoint1: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ pty1: - @echo $@ @echo Expect $@ to fail with DJGPP and MinGW. + @echo $@ @-case `uname` in \ *[Oo][Ss]/390*) : ;; \ *) AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ @@ -1161,8 +1162,8 @@ pty1: esac pty2: - @echo $@ @echo Expect $@ to fail with DJGPP and MinGW. + @echo $@ @-case `uname` in \ *[Oo][Ss]/390*) : ;; \ *) AWKPATH="$(srcdir)" $(AWK) -f $@.awk | od -c | $(AWK) '{ $$1 = $$1 ; print }' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ @@ -1170,8 +1171,8 @@ pty2: esac ignrcas3:: - @echo $@ @echo Expect $@ to fail with DJGPP and MinGW. + @echo $@ @-if locale -a | grep ell_GRC.1253 > /dev/null ; then \ [ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ell_GRC.1253 ; export GAWKLOCALE; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ @@ -1181,9 +1182,9 @@ ignrcas3:: arrdbg: @echo $@ @$(AWK) -v "okfile=./$@.ok" -v "mpfr_okfile=./$@-mpfr.ok" -f "$(srcdir)"/$@.awk | grep array_f >_$@ || echo EXIT CODE: $$? >> _$@ - @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum'; \ - then cmp "."/$@-mpfr.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; \ - else cmp "."/$@.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; fi + @-if echo "$$GAWK_TEST_ARGS" | egrep -e '-M|--bignum' > /dev/null; \ + then $(CMP) "."/$@-mpfr.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; \ + else $(CMP) "."/$@.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; fi sourcesplit: @echo $@ @@ -1202,8 +1203,8 @@ nsbad_cmd: # Use [:] in the regexp to keep MSYS from converting the /'s to \'s. nonfatal1: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk 2>&1 | $(AWK) '{print gensub(/invalid[:].*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -1237,14 +1238,13 @@ typedregex4: iolint: @echo $@ @echo hello > 'echo hello' - @touch 'exec cat' ; chmod 755 'exec cat' @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - @-$(RM) -f cat 'echo hello' 'exec cat' f1 f2 md5sum + @-$(RM) -f cat 'echo hello' f1 f2 cksum argcasfile: @echo $@ - @$(AWK) -f "$(srcdir)"/$@.awk ARGC=1 /no/such/file < "$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @$(AWK) -f "$(srcdir)"/$@.awk ARGC=1 ' /no/such/file' < "$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program @@ -1541,8 +1541,8 @@ exit2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ exitval2: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -1748,6 +1748,7 @@ hex2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ hsprint: + @echo Expect $@ to fail with MinGW. @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2118,8 +2119,8 @@ rand: else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi randtest: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2241,14 +2242,14 @@ rstest3: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ rstest4: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ rstest5: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2324,8 +2325,8 @@ splitwht: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ status-close: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2350,8 +2351,8 @@ strnum2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ strtod: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2524,8 +2525,8 @@ fflush: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ getlnhd: - @echo $@ @echo Expect $@ to fail with DJGPP and MinGW. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2592,39 +2593,39 @@ asortbool: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ backw: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ clos1way: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C; export GAWKLOCALE; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ clos1way2: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ clos1way3: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ clos1way4: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ clos1way5: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2826,14 +2827,14 @@ gnuops2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ gnuops3: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ gnureops: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2853,8 +2854,8 @@ icasers: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ id: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -2905,6 +2906,7 @@ indirectcall2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ inf-nan-torture: + @echo Expect $@ to fail with MinGW. @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -3035,8 +3037,8 @@ nonfatal2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ nonfatal3: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -3167,8 +3169,8 @@ regnul2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ regx8bit: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -3425,6 +3427,7 @@ backsmalls2: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ fmttest: + @echo Expect $@ to fail with MinGW. @echo $@ $(ZOS_FAIL) @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -3514,14 +3517,14 @@ fnmatch: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ fork: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ fork2: - @echo $@ @echo Expect $@ to fail with MinGW. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -3531,6 +3534,7 @@ functab4: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ functab5: + @echo Expect $@ to fail with MinGW. @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -3611,8 +3615,8 @@ mpfrrndeval: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ mpfrsqrt: - @echo $@ @echo Expect $@ to fail with DJGPP. + @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk -M >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ diff --git a/pc/config.h b/pc/config.h index a31f3b87..19f6fcae 100644 --- a/pc/config.h +++ b/pc/config.h @@ -464,7 +464,7 @@ #define PACKAGE_NAME "GNU Awk" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU Awk 5.1.1b" +#define PACKAGE_STRING "GNU Awk 5.1.1c" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gawk" @@ -473,7 +473,7 @@ #define PACKAGE_URL "http://www.gnu.org/software/gawk/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.1.1b" +#define PACKAGE_VERSION "5.1.1c" /* Define to 1 if *printf supports %a format */ #define PRINTF_HAS_A_FORMAT 1 @@ -534,7 +534,7 @@ /* Version number of package */ -#define VERSION "5.1.1b" +#define VERSION "5.1.1c" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE |