[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4088-g1316328
|
From: |
Arnold Robbins |
|
Subject: |
[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4088-g1316328 |
|
Date: |
Tue, 4 Aug 2020 02:12:37 -0400 (EDT) |
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, gawk-5.1-stable has been updated
via 1316328fd5e4677a4096ee116ad411e6af10cc57 (commit)
from c731b9eb6dbbc6683a4c5020b42fca0fb06427e7 (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=1316328fd5e4677a4096ee116ad411e6af10cc57
commit 1316328fd5e4677a4096ee116ad411e6af10cc57
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Tue Aug 4 09:12:13 2020 +0300
Simplify test suite handling of -M and -mpfr.ok files.
diff --git a/NEWS b/NEWS
index 9e59431..c879e11 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,9 @@ Changes from 5.1.0 to 5.1.1
directory and the extension directory has been removed. This
simplifies the distribution.
+7. The test suite has been improved, making it easier to run the entire
+ suite with -M. Use `GAWK_TEST_ARGS=-M make check' to do so.
+
Changes from 5.0.1 to 5.1.0
---------------------------
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 36cb089..d41f8db 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2020-08-04 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.tst: Rebuilt.
+
2020-07-25 Eli Zaretskii <eliz@gnu.org>
* Makefile (mingw32, mingw32-readline, mingw32-mpfr)
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index e7d9c87..26d93d7 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -294,11 +294,6 @@ FAIL_CODE1 = \
paramdup paramres parseme readbuf synerr1 synerr2 unterm
-# List of files which have .ok versions for MPFR
-CHECK_MPFR = \
- arraytype fnarydel fnparydl forcenum numrange rand
-
-
# Lists of tests that need particular locales
NEED_LOCALE_C = \
clos1way gsubtst6 range2
@@ -1035,9 +1030,9 @@ testext::
@echo $@
@$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c >
testext.awk
@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ testext.awk testexttmp.txt; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk
testexttmp.txt ; \
- fi
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum'; \
+ then cmp "."/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \
+ else cmp "."/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi
getfile:
@echo $@
@@ -1180,9 +1175,9 @@ ignrcas3::
arrdbg:
@echo $@
@$(AWK) -v "okfile=./$@.ok" -v "mpfr_okfile=./$@-mpfr.ok" -f
"$(srcdir)"/$@.awk | grep array_f >_$@ || echo EXIT CODE: $$? >> _$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) ./$@.ok _$@ && rm -f _$@
./$@.ok ./$@-mpfr.ok ; else \
- $(CMP) ./$@-mpfr.ok _$@ && rm -f _$@ ./$@.ok ./$@-mpfr.ok ; \
- fi
+ @-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
sourcesplit:
@echo $@
@@ -1915,10 +1910,10 @@ numindex:
numrange:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
numstr1:
@echo $@
@@ -2093,10 +2088,10 @@ prtoeval:
rand:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
randtest:
@echo $@
@@ -2557,10 +2552,10 @@ arraysort2:
arraytype:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
backw:
@echo $@
@@ -2652,10 +2647,10 @@ fieldwdth:
forcenum:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk --non-decimal-data
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --non-decimal-data >_$@ 2>&1 ||
echo EXIT CODE: $$? >>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
fpat1:
@echo $@
@@ -3374,17 +3369,17 @@ fmttest:
fnarydel:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
fnparydl:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
lc_num1:
@echo $@ $(ZOS_FAIL)
diff --git a/test/ChangeLog b/test/ChangeLog
index 311614e..a8b6e9a 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,14 @@
+2020-08-04 Arnold D. Robbins <arnold@skeeve.com>
+
+ Simplify handling of tests that have an -mpfr.ok file.
+
+ * Gentests: Remove CHECK_MPFR handling. Instead, read the
+ EXTRA_DIST list of files and generate better checking tests
+ for tests that have an -mpfr.ok file. Use GAWK_TEST__ARGS
+ instead of AWKFLAGS.
+ * Makefile.am (CHECK_MPFR): Removed.
+ (arrdbg, testext): Checks updated.
+
2020-07-20 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (EXPECTED_FAIL_ZOS): Add posix_compare to the list.
diff --git a/test/Gentests b/test/Gentests
index 392cbf2..ada5181 100755
--- a/test/Gentests
+++ b/test/Gentests
@@ -22,6 +22,13 @@ BEGIN {
# process the file Makefile.am:
+/^EXTRA_DIST *=/,/[^\\]$/ {
+ gsub(/(^EXTRA_DIST *=|\\$)/,"")
+ for (i = 1; i <= NF; i++)
+ extra_dist[$i]
+ next
+}
+
/^[[:upper:]_]*_TESTS *=/,/[^\\]$/ {
gsub(/(^[[:upper:]_]*_TESTS *=|\\$)/,"")
for (i = 1; i <= NF; i++)
@@ -108,15 +115,6 @@ BEGIN {
next
}
-/^CHECK_MPFR *=/,/[^\\]$/ {
- gsub(/(^CHECK_MPFR *=|\\$)/,"")
- for (i = 1; i <= NF; i++)
- {
- mpfr[$i]
- }
- next
-}
-
# Tests needing a particular locale
/^NEED_LOCALE_.* *=/,/[^\\]$/ {
if (/^NEED/)
@@ -255,16 +253,14 @@ function generate(x, s, i, locale_string)
}
}
- if (x in mpfr) {
- delete mpfr[x]
- printf "%s", locale_string
- printf "AWKPATH=\"$(srcdir)\" $(AWK) $(AWKFLAGS) -f $@.awk %s
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@\n", s
- printf "\t@-if test -z \"$$AWKFLAGS\" ; then $(CMP)
\"$(srcdir)\"/$@.ok _$@ && rm -f _$@ ; else \\\n"
- printf "\t$(CMP) \"$(srcdir)\"/$@-mpfr.ok _$@ && rm -f _$@ ;
\\\n"
- printf "\tfi\n\n"
+ printf "%s", locale_string
+ printf "AWKPATH=\"$(srcdir)\" $(AWK) -f $@.awk %s >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@\n", s
+
+ if ((x "-mpfr.ok") in extra_dist) {
+ printf "\t@-if echo \"$$GAWK_TEST_ARGS\" | egrep -q -e
'-M|--bignum' > /dev/null ; \\\n"
+ printf "\tthen $(CMP) \"$(srcdir)\"/$@-mpfr.ok _$@ && rm -f _$@
; \\\n"
+ printf "\telse $(CMP) \"$(srcdir)\"/$@.ok _$@ && rm -f _$@ ;
fi\n\n"
} else {
- printf "%s", locale_string
- printf "AWKPATH=\"$(srcdir)\" $(AWK) -f $@.awk %s >_$@ 2>&1 ||
echo EXIT CODE: $$? >>_$@\n", s
printf "\t@-$(CMP) \"$(srcdir)\"/$@.ok _$@ && rm -f _$@\n\n"
}
}
@@ -297,7 +293,6 @@ END {
for (x in nondec)
if (!(x in targets))
printf "WARNING: --non-decimal-data target `%s' is
missing.\n", x > "/dev/stderr"
-
for (x in re_interval)
if (!(x in targets))
printf "WARNING: --re-interval target `%s' is
missing.\n", x > "/dev/stderr"
diff --git a/test/Makefile.am b/test/Makefile.am
index 85342f0..e598dee 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1507,10 +1507,6 @@ FAIL_CODE1 = \
incdupe2 lintwarn match2 mixed1 noparms paramasfunc1 paramasfunc2 \
paramdup paramres parseme readbuf synerr1 synerr2 unterm
-# List of files which have .ok versions for MPFR
-CHECK_MPFR = \
- arraytype fnarydel fnparydl forcenum numrange rand
-
# Lists of tests that need particular locales
NEED_LOCALE_C = \
clos1way gsubtst6 range2
@@ -2251,9 +2247,9 @@ testext::
@echo $@
@$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c >
testext.awk
@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ testext.awk testexttmp.txt; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk
testexttmp.txt ; \
- fi
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum'; \
+ then cmp "."/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \
+ else cmp "."/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi
getfile:
@echo $@
@@ -2391,10 +2387,9 @@ ignrcas3::
arrdbg:
@echo $@
@$(AWK) -v "okfile=./$@.ok" -v "mpfr_okfile=./$@-mpfr.ok" -f
"$(srcdir)"/$@.awk | grep array_f >_$@ || echo EXIT CODE: $$? >> _$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) ./$@.ok _$@ && rm -f _$@
./$@.ok ./$@-mpfr.ok ; else \
- $(CMP) ./$@-mpfr.ok _$@ && rm -f _$@ ./$@.ok ./$@-mpfr.ok ; \
- fi
-
+ @-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
sourcesplit:
@echo $@
diff --git a/test/Makefile.in b/test/Makefile.in
index b7abd5c..324b361 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1771,11 +1771,6 @@ FAIL_CODE1 = \
paramdup paramres parseme readbuf synerr1 synerr2 unterm
-# List of files which have .ok versions for MPFR
-CHECK_MPFR = \
- arraytype fnarydel fnparydl forcenum numrange rand
-
-
# Lists of tests that need particular locales
NEED_LOCALE_C = \
clos1way gsubtst6 range2
@@ -2704,9 +2699,9 @@ testext::
@echo $@
@$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c >
testext.awk
@$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ testext.awk testexttmp.txt; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ testext.awk
testexttmp.txt ; \
- fi
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum'; \
+ then cmp "."/$@-mpfr.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; \
+ else cmp "."/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi
getfile:
@echo $@
@@ -2842,9 +2837,9 @@ ignrcas3::
arrdbg:
@echo $@
@$(AWK) -v "okfile=./$@.ok" -v "mpfr_okfile=./$@-mpfr.ok" -f
"$(srcdir)"/$@.awk | grep array_f >_$@ || echo EXIT CODE: $$? >> _$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) ./$@.ok _$@ && rm -f _$@
./$@.ok ./$@-mpfr.ok ; else \
- $(CMP) ./$@-mpfr.ok _$@ && rm -f _$@ ./$@.ok ./$@-mpfr.ok ; \
- fi
+ @-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
sourcesplit:
@echo $@
@@ -3575,10 +3570,10 @@ numindex:
numrange:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
numstr1:
@echo $@
@@ -3753,10 +3748,10 @@ prtoeval:
rand:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
randtest:
@echo $@
@@ -4210,10 +4205,10 @@ arraysort2:
arraytype:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
backw:
@echo $@
@@ -4298,10 +4293,10 @@ fieldwdth:
forcenum:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk --non-decimal-data
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --non-decimal-data >_$@ 2>&1 ||
echo EXIT CODE: $$? >>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
fpat1:
@echo $@
@@ -5008,17 +5003,17 @@ fmttest:
fnarydel:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
fnparydl:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
lc_num1:
@echo $@ $(ZOS_FAIL)
diff --git a/test/Maketests b/test/Maketests
index 3433c65..ee2c828 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -680,10 +680,10 @@ numindex:
numrange:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
numstr1:
@echo $@
@@ -858,10 +858,10 @@ prtoeval:
rand:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
randtest:
@echo $@
@@ -1315,10 +1315,10 @@ arraysort2:
arraytype:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
backw:
@echo $@
@@ -1403,10 +1403,10 @@ fieldwdth:
forcenum:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk --non-decimal-data
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --non-decimal-data >_$@ 2>&1 ||
echo EXIT CODE: $$? >>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
fpat1:
@echo $@
@@ -2113,17 +2113,17 @@ fmttest:
fnarydel:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
fnparydl:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) $(AWKFLAGS) -f $@.awk >_$@ 2>&1 || echo
EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f
_$@ ; else \
- $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
- fi
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$?
>>_$@
+ @-if echo "$$GAWK_TEST_ARGS" | egrep -q -e '-M|--bignum' > /dev/null ; \
+ then $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
lc_num1:
@echo $@ $(ZOS_FAIL)
-----------------------------------------------------------------------
Summary of changes:
NEWS | 3 +++
pc/ChangeLog | 4 ++++
pc/Makefile.tst | 65 ++++++++++++++++++++++++++------------------------------
test/ChangeLog | 11 ++++++++++
test/Gentests | 33 ++++++++++++----------------
test/Makefile.am | 17 ++++++---------
test/Makefile.in | 65 ++++++++++++++++++++++++++------------------------------
test/Maketests | 48 ++++++++++++++++++++---------------------
8 files changed, 122 insertions(+), 124 deletions(-)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4088-g1316328,
Arnold Robbins <=