aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO3
-rw-r--r--test/ChangeLog7
-rwxr-xr-xtest/Gentests6
-rw-r--r--test/Makefile.am9
-rw-r--r--test/Makefile.in20
-rw-r--r--test/Maketests11
-rw-r--r--test/rand-mpfr.ok2
7 files changed, 33 insertions, 25 deletions
diff --git a/TODO b/TODO
index fba09038..47f1c6d9 100644
--- a/TODO
+++ b/TODO
@@ -15,9 +15,6 @@ TODO
Minor Cleanups and Code Improvements
------------------------------------
- make check with AWKFLAGS=-M has 4 tests that fail but the
- results are not reflected in make diffout. Look at this.
-
API:
??? #if !defined(GAWK) && !defined(GAWK_OMIT_CONVENIENCE_MACROS)
diff --git a/test/ChangeLog b/test/ChangeLog
index 914a0fd1..574acbdb 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-14 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (rand): Let Gentests create the test.
+ (fmtspcl): Add $(AWKFLAGS).
+ * Gentests: For MPFR tests, add $(AWKFLAGS) on the command lie.
+ * mpfr-rand.ok: Updated.
+
2013-01-10 Andrew J. Schorr <aschorr@telemetry-investments.com>
* inplace.1.in, inplace.2.in, inplace.in, inplace1.1.ok, inplace1.2.ok,
diff --git a/test/Gentests b/test/Gentests
index ae56b8cc..c69c0f86 100755
--- a/test/Gentests
+++ b/test/Gentests
@@ -48,7 +48,10 @@ BEGIN {
/^CHECK_MPFR *=/,/[^\\]$/ {
gsub(/(^CHECK_MPFR *=|\\$)/,"")
for (i = 1; i <= NF; i++)
+ {
mpfr[$i]
+printf("adding %s to mpfr\n", $i) > "/dev/stderr"
+ }
next
}
@@ -99,14 +102,15 @@ function generate(x, s)
}
printf "\t@echo $@\n"
- printf "\t@AWKPATH=$(srcdir) $(AWK) -f $@.awk %s >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@\n", s
if (x in mpfr) {
delete mpfr[x]
+ printf "\t@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"
} else {
+ printf "\t@AWKPATH=$(srcdir) $(AWK) -f $@.awk %s >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@\n", s
printf "\t@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@\n\n"
}
}
diff --git a/test/Makefile.am b/test/Makefile.am
index 7a541f97..6c74385a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1252,7 +1252,7 @@ fmtspcl.ok: fmtspcl.tok Makefile
fmtspcl: fmtspcl.ok
@echo $@
- @$(AWK) -f $(srcdir)/fmtspcl.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @$(AWK) $(AWKFLAGS) -f $(srcdir)/fmtspcl.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-if test -z "$$AWKFLAGS" ; then $(CMP) $@.ok _$@ && rm -f _$@ ; else \
$(CMP) $(srcdir)/$@-mpfr.ok _$@ && rm -f _$@ ; \
fi
@@ -1598,13 +1598,6 @@ rri1::
AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
-rand:
- @echo $@
- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ ; else \
- ($(CMP) $(srcdir)/$@-mpfr.ok _$@ || $(CMP) $(srcdir)/$@-mpfr1.ok _$@) && rm -f _$@ ; \
- fi
-
mpfrieee:
@echo $@
@$(AWK) -M -vPREC=double -f $(srcdir)/$@.awk > _$@ 2>&1
diff --git a/test/Makefile.in b/test/Makefile.in
index 52d8edc5..e3affc59 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1633,7 +1633,7 @@ fmtspcl.ok: fmtspcl.tok Makefile
fmtspcl: fmtspcl.ok
@echo $@
- @$(AWK) -f $(srcdir)/fmtspcl.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @$(AWK) $(AWKFLAGS) -f $(srcdir)/fmtspcl.awk --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-if test -z "$$AWKFLAGS" ; then $(CMP) $@.ok _$@ && rm -f _$@ ; else \
$(CMP) $(srcdir)/$@-mpfr.ok _$@ && rm -f _$@ ; \
fi
@@ -1979,13 +1979,6 @@ rri1::
AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
-rand:
- @echo $@
- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-if test -z "$$AWKFLAGS" ; then $(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ ; else \
- ($(CMP) $(srcdir)/$@-mpfr.ok _$@ || $(CMP) $(srcdir)/$@-mpfr1.ok _$@) && rm -f _$@ ; \
- fi
-
mpfrieee:
@echo $@
@$(AWK) -M -vPREC=double -f $(srcdir)/$@.awk > _$@ 2>&1
@@ -2797,6 +2790,13 @@ prtoeval:
@AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+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
+
range1:
@echo $@
@AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3394,14 +3394,14 @@ fmttest:
fnarydel:
@echo $@
- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @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
fnparydl:
@echo $@
- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @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
diff --git a/test/Maketests b/test/Maketests
index be8b53b9..d3dc8dce 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -655,6 +655,13 @@ prtoeval:
@AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+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
+
range1:
@echo $@
@AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1252,14 +1259,14 @@ fmttest:
fnarydel:
@echo $@
- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @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
fnparydl:
@echo $@
- @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @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
diff --git a/test/rand-mpfr.ok b/test/rand-mpfr.ok
index 76ab51b4..448f4032 100644
--- a/test/rand-mpfr.ok
+++ b/test/rand-mpfr.ok
@@ -1 +1 @@
- 27 89 11 47 77 49 13 34 78 93 76 96 91 53 3 94 25 51 10
+ 25 42 47 49 80 5 4 92 59 96 8 63 92 28 41 37 80 51 48
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 09:22:30 +0000