aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pc/Makefile.tst24
-rw-r--r--test/ChangeLog7
-rw-r--r--test/Makefile.am11
-rw-r--r--test/Makefile.in28
-rw-r--r--test/Maketests18
-rw-r--r--test/arraytype-mpfr.ok16
-rw-r--r--test/arrdbg-mpfr.ok12
-rw-r--r--test/forcenum-mpfr.ok9
-rw-r--r--test/numrange-mpfr.ok2
9 files changed, 103 insertions, 24 deletions
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 661f7736..6a1d917a 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -296,7 +296,7 @@ FAIL_CODE1 = \
# List of files which have .ok versions for MPFR
CHECK_MPFR = \
- rand fnarydel fnparydl
+ arraytype arrdbg fnarydel fnparydl forcenum numrange rand
# Lists of tests that need particular locales
@@ -1177,7 +1177,9 @@ ignrcas3::
arrdbg:
@echo $@
@$(AWK) -v "okfile=./$@.ok" -f "$(srcdir)"/$@.awk | grep array_f >_$@ || echo EXIT CODE: $$? >> _$@
- @-$(CMP) ./$@.ok _$@ && rm -f _$@ ./$@.ok
+ @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; else \
+ $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ fi
sourcesplit:
@echo $@
@@ -1910,8 +1912,10 @@ numindex:
numrange:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @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
numstr1:
@echo $@
@@ -2550,8 +2554,10 @@ arraysort2:
arraytype:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @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
backw:
@echo $@
@@ -2643,8 +2649,10 @@ fieldwdth:
forcenum:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --non-decimal-data >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @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
fpat1:
@echo $@
diff --git a/test/ChangeLog b/test/ChangeLog
index b741651e..6e786e8e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2020-07-08 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (EXTRADIST): Add additional ok files for MPFR.
+ (CHECK_MPFR): Add arraytype, arrdbg, forcenum and numrange
+ (arrdbg): Update to check -mpfr.ok file also.
+ * arraytype-mpfr.ok, arrdbg-mpfr.ok, forcenum-mpfr.ok, numrange-mpfr.ok: New files.
+
2020-07-07 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (EXTRA_DIST): New test, mpfrcase2.
diff --git a/test/Makefile.am b/test/Makefile.am
index 76634925..6d953533 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -79,7 +79,9 @@ EXTRA_DIST = \
arraysort2.ok \
arraytype.awk \
arraytype.ok \
+ arraytype-mpfr.ok \
arrdbg.awk \
+ arrdbg-mpfr.ok \
arrymem1.awk \
arrymem1.ok \
arryref2.awk \
@@ -340,6 +342,7 @@ EXTRA_DIST = \
fnparydl.ok \
forcenum.awk \
forcenum.ok \
+ forcenum-mpfr.ok \
fordel.awk \
fordel.ok \
fork.awk \
@@ -843,6 +846,7 @@ EXTRA_DIST = \
numindex.ok \
numrange.awk \
numrange.ok \
+ numrange-mpfr.ok \
numstr1.awk \
numstr1.ok \
numsubstr.awk \
@@ -1505,7 +1509,7 @@ FAIL_CODE1 = \
# List of files which have .ok versions for MPFR
CHECK_MPFR = \
- rand fnarydel fnparydl
+ arraytype arrdbg fnarydel fnparydl forcenum numrange rand
# Lists of tests that need particular locales
NEED_LOCALE_C = \
@@ -2384,7 +2388,10 @@ ignrcas3::
arrdbg:
@echo $@
@$(AWK) -v "okfile=./$@.ok" -f "$(srcdir)"/$@.awk | grep array_f >_$@ || echo EXIT CODE: $$? >> _$@
- @-$(CMP) ./$@.ok _$@ && rm -f _$@ ./$@.ok
+ @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; else \
+ $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ fi
+
sourcesplit:
@echo $@
diff --git a/test/Makefile.in b/test/Makefile.in
index 4af1a7ba..5a6215db 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -342,7 +342,9 @@ EXTRA_DIST = \
arraysort2.ok \
arraytype.awk \
arraytype.ok \
+ arraytype-mpfr.ok \
arrdbg.awk \
+ arrdbg-mpfr.ok \
arrymem1.awk \
arrymem1.ok \
arryref2.awk \
@@ -603,6 +605,7 @@ EXTRA_DIST = \
fnparydl.ok \
forcenum.awk \
forcenum.ok \
+ forcenum-mpfr.ok \
fordel.awk \
fordel.ok \
fork.awk \
@@ -1106,6 +1109,7 @@ EXTRA_DIST = \
numindex.ok \
numrange.awk \
numrange.ok \
+ numrange-mpfr.ok \
numstr1.awk \
numstr1.ok \
numsubstr.awk \
@@ -1769,7 +1773,7 @@ FAIL_CODE1 = \
# List of files which have .ok versions for MPFR
CHECK_MPFR = \
- rand fnarydel fnparydl
+ arraytype arrdbg fnarydel fnparydl forcenum numrange rand
# Lists of tests that need particular locales
@@ -2835,7 +2839,9 @@ ignrcas3::
arrdbg:
@echo $@
@$(AWK) -v "okfile=./$@.ok" -f "$(srcdir)"/$@.awk | grep array_f >_$@ || echo EXIT CODE: $$? >> _$@
- @-$(CMP) ./$@.ok _$@ && rm -f _$@ ./$@.ok
+ @-if test -z "$$AWKFLAGS" ; then $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; else \
+ $(CMP) "$(srcdir)"/$@-mpfr.ok _$@ && rm -f _$@ ; \
+ fi
sourcesplit:
@echo $@
@@ -3566,8 +3572,10 @@ numindex:
numrange:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @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
numstr1:
@echo $@
@@ -4199,8 +4207,10 @@ arraysort2:
arraytype:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @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
backw:
@echo $@
@@ -4285,8 +4295,10 @@ fieldwdth:
forcenum:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --non-decimal-data >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @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
fpat1:
@echo $@
diff --git a/test/Maketests b/test/Maketests
index 0b98f784..2ef37caf 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -680,8 +680,10 @@ numindex:
numrange:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @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
numstr1:
@echo $@
@@ -1313,8 +1315,10 @@ arraysort2:
arraytype:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @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
backw:
@echo $@
@@ -1399,8 +1403,10 @@ fieldwdth:
forcenum:
@echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --non-decimal-data >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+ @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
fpat1:
@echo $@
diff --git a/test/arraytype-mpfr.ok b/test/arraytype-mpfr.ok
new file mode 100644
index 00000000..36e8f99b
--- /dev/null
+++ b/test/arraytype-mpfr.ok
@@ -0,0 +1,16 @@
+array
+str
+array
+null
+array
+str
+array
+null
+array
+str
+array
+null
+array
+str
+array
+null
diff --git a/test/arrdbg-mpfr.ok b/test/arrdbg-mpfr.ok
new file mode 100644
index 00000000..010801cb
--- /dev/null
+++ b/test/arrdbg-mpfr.ok
@@ -0,0 +1,12 @@
+array_f subscript [3]
+ array_func: str_array_func
+array_f subscript [-3]
+ array_func: str_array_func
+array_f subscript [3.0]
+ array_func: str_array_func
+array_f subscript [ 3]
+ array_func: str_array_func
+array_f subscript [0]
+ array_func: str_array_func
+array_f subscript [-1]
+ array_func: str_array_func
diff --git a/test/forcenum-mpfr.ok b/test/forcenum-mpfr.ok
new file mode 100644
index 00000000..6e5853fa
--- /dev/null
+++ b/test/forcenum-mpfr.ok
@@ -0,0 +1,9 @@
+[] -> 0 (type string)
+[5apple] -> 5 (type string)
+[NaN] -> nan (type strnum)
+[-NaN] -> nan (type strnum)
+[+NaN] -> nan (type strnum)
+[ 6] -> 6 (type strnum)
+[0x1az] -> 26 (type string)
+[011Q] -> 9 (type string)
+[027] -> 23 (type strnum)
diff --git a/test/numrange-mpfr.ok b/test/numrange-mpfr.ok
new file mode 100644
index 00000000..2f084e39
--- /dev/null
+++ b/test/numrange-mpfr.ok
@@ -0,0 +1,2 @@
+-1.2e+931 -12000000000000000023869272521829212151376224284038826410491631072247223930898697894494751122199611031696331881198430123310788883489723019223000573640259371063714952207062438085168771640470751425809639568206897248922718204650691199569214339149443994838825335479571578957075566316988609963847861723327109992246837205567235607773890309471137488800374383009068687547118036715452301954858700836601124580336340038617883134449214092245802588446405229331386515660677585038235109701545271243902330575714021315127223571588764628179725351186585908351382110051143587405409927546018060172307656019659275511658624125158517807640363832094340920801581446507863850186984663749124902382044782795512644763497122330988233279646807817789403972164002561612114866682762706548477524115596786591512372612296461584970713050884678735893942581035124339179550774662878726741328519231942448856426396556949721845110345583968012206662741485777689522285472492027904 12000000000000000023869272521829212151376224284038826410491631072247223930898697894494751122199611031696331881198430123310788883489723019223000573640259371063714952207062438085168771640470751425809639568206897248922718204650691199569214339149443994838825335479571578957075566316988609963847861723327109992246837205567235607773890309471137488800374383009068687547118036715452301954858700836601124580336340038617883134449214092245802588446405229331386515660677585038235109701545271243902330575714021315127223571588764628179725351186585908351382110051143587405409927546018060172307656019659275511658624125158517807640363832094340920801581446507863850186984663749124902382044782795512644763497122330988233279646807817789403972164002561612114866682762706548477524115596786591512372612296461584970713050884678735893942581035124339179550774662878726741328519231942448856426396556949721845110345583968012206662741485777689522285472492027904
+1.2e+931 12000000000000000023869272521829212151376224284038826410491631072247223930898697894494751122199611031696331881198430123310788883489723019223000573640259371063714952207062438085168771640470751425809639568206897248922718204650691199569214339149443994838825335479571578957075566316988609963847861723327109992246837205567235607773890309471137488800374383009068687547118036715452301954858700836601124580336340038617883134449214092245802588446405229331386515660677585038235109701545271243902330575714021315127223571588764628179725351186585908351382110051143587405409927546018060172307656019659275511658624125158517807640363832094340920801581446507863850186984663749124902382044782795512644763497122330988233279646807817789403972164002561612114866682762706548477524115596786591512372612296461584970713050884678735893942581035124339179550774662878726741328519231942448856426396556949721845110345583968012206662741485777689522285472492027904 -12000000000000000023869272521829212151376224284038826410491631072247223930898697894494751122199611031696331881198430123310788883489723019223000573640259371063714952207062438085168771640470751425809639568206897248922718204650691199569214339149443994838825335479571578957075566316988609963847861723327109992246837205567235607773890309471137488800374383009068687547118036715452301954858700836601124580336340038617883134449214092245802588446405229331386515660677585038235109701545271243902330575714021315127223571588764628179725351186585908351382110051143587405409927546018060172307656019659275511658624125158517807640363832094340920801581446507863850186984663749124902382044782795512644763497122330988233279646807817789403972164002561612114866682762706548477524115596786591512372612296461584970713050884678735893942581035124339179550774662878726741328519231942448856426396556949721845110345583968012206662741485777689522285472492027904
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 23:37:47 +0000