aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pc/ChangeLog7
-rw-r--r--pc/GenMakefileTst.awk2
-rw-r--r--pc/Makefile.tst89
-rw-r--r--test/ChangeLog9
-rw-r--r--test/Makefile.am14
-rw-r--r--test/Makefile.in17
6 files changed, 80 insertions, 58 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog
index bf60f218..0530e52b 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
2021-05-09 Eli Zaretskii <eliz@gnu.org>
* Makefile.tst (testext): Use $(CMP), not a literal "cmp", so that
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.tst b/pc/Makefile.tst
index b5197f29..d0085049 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 _$@
@@ -1037,18 +1038,18 @@ testext::
@$(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
+ 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: $$? >>_$@ ; \
@@ -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 _$@
@@ -1240,7 +1241,7 @@ iolint:
@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' 'exec cat' f1 f2 cksum
argcasfile:
@echo $@
@@ -1541,8 +1542,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 +1749,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 +2120,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 +2243,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 +2326,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 +2352,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 +2526,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 _$@
@@ -2587,39 +2589,39 @@ arraytype:
else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
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 _$@
@@ -2821,14 +2823,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 _$@
@@ -2848,8 +2850,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 _$@
@@ -2900,6 +2902,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 _$@
@@ -3030,8 +3033,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 _$@
@@ -3162,8 +3165,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 _$@
@@ -3420,6 +3423,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 _$@
@@ -3509,14 +3513,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 _$@
@@ -3526,6 +3530,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 _$@
@@ -3606,8 +3611,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/test/ChangeLog b/test/ChangeLog
index dff7a550..6e6f3568 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,12 @@
+2021-05-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * argcasfile.ok: Add the leading space in the argument; see
+ pc/ChangeLog for explanation why.
+
+ General:
+ - Don't use egrep -q, not portable to Solaris 10.
+ - Use $(CMP) instead of cmp.
+
2021-05-09 Eli Zaretskii <eliz@gnu.org>
* Makefile.am (EXPECTED_FAIL_MINGW): Update for the new tests.
diff --git a/test/Makefile.am b/test/Makefile.am
index 441e7017..2a078630 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2280,9 +2280,9 @@ 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 $@
@@ -2420,9 +2420,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 $@
@@ -2485,7 +2485,7 @@ iolint:
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 _$@
# Targets generated for other tests:
diff --git a/test/Makefile.in b/test/Makefile.in
index 294136d7..273badce 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1834,9 +1834,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
@@ -2732,8 +2733,8 @@ testext::
@$(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
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi
getfile:
@echo $@
@@ -2870,8 +2871,8 @@ 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
+ then $(CMP) "."/$@-mpfr.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; \
+ else $(CMP) "."/$@.ok _$@ && rm -f _$@ $@.ok $@-mpfr.ok ; fi
sourcesplit:
@echo $@
@@ -2931,7 +2932,7 @@ iolint:
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-04 15:02:35 +0000