aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xChangeLog4
-rw-r--r--Makefile.am3
-rw-r--r--Makefile.in3
-rw-r--r--pc/ChangeLog7
-rw-r--r--pc/GenMakefileTst.awk5
-rw-r--r--pc/Makefile.tst58
-rw-r--r--pc/config.h21
-rw-r--r--test/ChangeLog6
-rw-r--r--test/Makefile.am10
-rw-r--r--test/Makefile.in10
-rw-r--r--test/eofsrc1.ok4
-rw-r--r--test/symtab6.ok4
12 files changed, 85 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog
index e0110a0e..1e6385bc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-26 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (pc/Makefile.tst): Fix to work for out of tree builds.
+
2019-01-25 Arnold D. Robbins <arnold@skeeve.com>
* main.c (UPDATE_YEAR): Bump to 2019.
diff --git a/Makefile.am b/Makefile.am
index 2fede4a6..4d51a09f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -192,7 +192,8 @@ command.c: command.y
sed 's/parse error/syntax error/g' < $@ > $@.tmp && mv $@.tmp $@
pc/Makefile.tst: test/Makefile.in
- awk -f "$(top_srcdir)"/pc/GenMakefileTst.awk ../test/Makefile.in > pc/Makefile.tst
+ cat "$(top_srcdir)"/pc/Makefile.tst.prologue > pc/Makefile.tst
+ awk -f "$(top_srcdir)"/pc/GenMakefileTst.awk test/Makefile.in >> pc/Makefile.tst
# This is for my development & testing.
efence: gawk
diff --git a/Makefile.in b/Makefile.in
index f108e011..fcc2359e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1268,7 +1268,8 @@ command.c: command.y
sed 's/parse error/syntax error/g' < $@ > $@.tmp && mv $@.tmp $@
pc/Makefile.tst: test/Makefile.in
- awk -f "$(top_srcdir)"/pc/GenMakefileTst.awk ../test/Makefile.in > pc/Makefile.tst
+ cat "$(top_srcdir)"/pc/Makefile.tst.prologue > pc/Makefile.tst
+ awk -f "$(top_srcdir)"/pc/GenMakefileTst.awk test/Makefile.in >> pc/Makefile.tst
# This is for my development & testing.
efence: gawk
diff --git a/pc/ChangeLog b/pc/ChangeLog
index f28257ea..c95d1d4f 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,10 @@
+2019-01-26 Arnold D. Robbins <arnold@skeeve.com>
+
+ * GenMakefileTst.awk: Remove BEGIN rule that did cat of
+ prologue file; moved to main Makefile so that out-of-tree
+ builds (make distcheck) will work.
+ * Makefile.tst, config.h: Regenerated.
+
2018-09-08 Eli Zaretskii <eliz@gnu.org>
* config.sed (_GNU_SOURCE) [__MINGW32__]: Define to 1.
diff --git a/pc/GenMakefileTst.awk b/pc/GenMakefileTst.awk
index 0761a3b2..7fe92885 100644
--- a/pc/GenMakefileTst.awk
+++ b/pc/GenMakefileTst.awk
@@ -2,11 +2,6 @@
# This program generates pc/Makefile.tst
-BEGIN {
- # Print the prologue
- system("cat Makefile.tst.prologue")
-}
-
# Skip the first part of Makefile.in
/Get rid of core files/ { process = 1 }
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index de66b877..f937c064 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -187,11 +187,12 @@ UNIX_TESTS = \
GAWK_EXT_TESTS = \
aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort arraysort2 \
+ arraytype \
backw badargs beginfile1 beginfile2 binmode1 \
charasbytes colonwarn clos1way clos1way2 clos1way3 clos1way4 clos1way5 \
clos1way6 crlf \
dbugeval dbugeval2 dbugtypedre1 dbugtypedre2 delsub \
- devfd devfd1 devfd2 dumpvars \
+ devfd devfd1 devfd2 dfacheck1 dumpvars \
errno exit \
fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpatnull fsfwfs \
funlen functab1 functab2 functab3 fwtest fwtest2 fwtest3 fwtest4 \
@@ -203,17 +204,17 @@ GAWK_EXT_TESTS = \
lint lintexp lintindex lintint lintlength lintold lintset lintwarn \
manyfiles match1 match2 match3 mbstr1 mbstr2 mixed1 mktime muldimposix \
nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
- nsbad nsbad_cmd nsindirect1 nsindirect2 nsprof1 nsprof2 \
+ nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 nsindirect2 nsprof1 nsprof2 \
patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge \
procinfs profile0 profile1 profile2 profile3 profile4 profile5 profile6 \
- profile7 profile8 profile9 profile10 pty1 pty2 \
+ profile7 profile8 profile9 profile10 profile11 pty1 pty2 \
rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin \
rsstart1 rsstart2 rsstart3 rstest6 \
shadow shadowbuiltin sortfor sortfor2 sortu sourcesplit split_after_fpat \
splitarg4 strftfld strftime strtonum strtonum1 switch2 symtab1 symtab2 \
symtab3 symtab4 symtab5 symtab6 symtab7 symtab8 symtab9 symtab10 \
- timeout typedregex1 typedregex2 typedregex3 typeof1 typeof2 typeof3 \
- typeof4 typeof5 \
+ timeout typedregex1 typedregex2 typedregex3 typedregex4 \
+ typeof1 typeof2 typeof3 typeof4 typeof5 \
watchpoint1
ARRAYDEBUG_TESTS = arrdbg
@@ -263,7 +264,7 @@ NEED_POSIX = printf0 posix2008sub paramasfunc1 paramasfunc2 muldimposix
# List of tests that need --pretty-print
NEED_PRETTY = nsprof1 nsprof2 \
- profile4 profile5 profile8 profile9 profile10
+ profile4 profile5 profile8 profile9 profile10 profile11
# List of tests that need --re-interval
@@ -1005,8 +1006,7 @@ charasbytes:
symtab6:
@echo $@
- @$(AWK) -d__$@ -f "$(srcdir)"/$@.awk
- @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' > _$@ ; rm __$@
+ @AWKPATH="$(srcdir)" @$(AWK) -f $@.awk > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
symtab8:
@@ -1099,7 +1099,7 @@ sourcesplit:
eofsrc1:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) -f "$(srcdir)"/$@a.awk -f "$(srcdir)"/$@b.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@a.awk -f $@b.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
nsbad_cmd:
@@ -1130,6 +1130,16 @@ longwrds:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v SORT="$(SORT)" < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+spacere:
+ @echo $@
+ @LC_ALL=C AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+typedregex4:
+ @echo $@
+ @$(AWK) -v x=@/foo/ -f "$(srcdir)"/$@.awk y=@/bar/ /dev/null >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
Gt-dummy:
# file Maketests, generated from Makefile.am by the Gentests program
addcomma:
@@ -2137,11 +2147,6 @@ sortglos:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-spacere:
- @echo $@
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
splitargv:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2413,6 +2418,11 @@ arraysort2:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+arraytype:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
backw:
@echo $@
@echo Expect $@ to fail with DJGPP.
@@ -2481,6 +2491,11 @@ delsub:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+dfacheck1:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
exit:
@echo $@
@-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2827,6 +2842,16 @@ nsbad:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+nsforloop:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+nsfuncrecurse:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
nsindirect1:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2908,6 +2933,11 @@ profile10:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+profile11:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
regnul1:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/pc/config.h b/pc/config.h
index 6ebf5975..d347279e 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -131,9 +131,6 @@
/* Define if you have the libsigsegv library. */
#undef HAVE_LIBSIGSEGV
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
/* Define to 1 if you have the <locale.h> header file. */
#if defined(__MINGW32__) || defined(__DJGPP__)
#define HAVE_LOCALE_H 1
@@ -231,9 +228,6 @@
#define HAVE_SOCKETS 1
#endif
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
/* Define to 1 if stdbool.h conforms to C99. */
#if defined(__MINGW32__) || defined(__DJGPP__)
#define HAVE_STDBOOL_H 1
@@ -358,6 +352,9 @@
/* Define to 1 if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H
+/* Define to 1 if you have the `timegm' function. */
+#undef HAVE_TIMEGM
+
/* Define to 1 if you have the `tmpfile' function. */
#ifdef __DJGPP__
#define HAVE_TMPFILE 1
@@ -448,9 +445,6 @@
/* Define to 1 if you have the `__etoa_l' function. */
#undef HAVE___ETOA_L
-/* enable severe portability problems */
-#undef I_DONT_KNOW_WHAT_IM_DOING
-
/* disable lint checks */
#undef NO_LINT
@@ -464,7 +458,7 @@
#define PACKAGE_NAME "GNU Awk"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Awk 4.2.60"
+#define PACKAGE_STRING "GNU Awk 4.2.61"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gawk"
@@ -473,7 +467,7 @@
#define PACKAGE_URL "http://www.gnu.org/software/gawk/"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.2.60"
+#define PACKAGE_VERSION "4.2.61"
/* Define to 1 if *printf supports %a format */
#define PRINTF_HAS_A_FORMAT 1
@@ -507,9 +501,6 @@
/* Define to 1 if the character set is EBCDIC */
#undef USE_EBCDIC
-/* force use of our version of strftime */
-#undef USE_INCLUDED_STRFTIME
-
/* This is required to compile Gnulib regex code. */
#ifdef __MINGW32__
#define _GNU_SOURCE 1
@@ -537,7 +528,7 @@
/* Version number of package */
-#define VERSION "4.2.60"
+#define VERSION "4.2.61"
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
diff --git a/test/ChangeLog b/test/ChangeLog
index 87482dc4..1ed20361 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-26 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (EXTRA_DIST): Use correct filenames for dfacheck test.
+ (symtab6, eofsrc1): Make tests work for out of tree builds.
+ * symtab6.ok, eofsrc1.ok: Update after change.
+
2018-01-25 Arnold D. Robbins <arnold@skeeve.com>
* badargs.ok: Adjust after code changes.
diff --git a/test/Makefile.am b/test/Makefile.am
index 046d8c67..2ee231ad 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -243,9 +243,9 @@ EXTRA_DIST = \
devfd1.awk \
devfd1.ok \
devfd2.ok \
- dfacheck.awk \
- dfacheck.in \
- dfacheck.ok \
+ dfacheck1.awk \
+ dfacheck1.in \
+ dfacheck1.ok \
dfamb1.awk \
dfamb1.in \
dfamb1.ok \
@@ -2129,7 +2129,7 @@ charasbytes:
symtab6:
@echo $@
- @$(AWK) -f "$(srcdir)"/$@.awk > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @AWKPATH="$(srcdir)" @$(AWK) -f $@.awk > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
symtab8:
@@ -2221,7 +2221,7 @@ sourcesplit:
eofsrc1:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) -f "$(srcdir)"/$@a.awk -f "$(srcdir)"/$@b.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@a.awk -f $@b.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
nsbad_cmd:
diff --git a/test/Makefile.in b/test/Makefile.in
index e0fbd970..c7ed278e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -501,9 +501,9 @@ EXTRA_DIST = \
devfd1.awk \
devfd1.ok \
devfd2.ok \
- dfacheck.awk \
- dfacheck.in \
- dfacheck.ok \
+ dfacheck1.awk \
+ dfacheck1.in \
+ dfacheck1.ok \
dfamb1.awk \
dfamb1.in \
dfamb1.ok \
@@ -2578,7 +2578,7 @@ charasbytes:
symtab6:
@echo $@
- @$(AWK) -f "$(srcdir)"/$@.awk > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @AWKPATH="$(srcdir)" @$(AWK) -f $@.awk > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
symtab8:
@@ -2668,7 +2668,7 @@ sourcesplit:
eofsrc1:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) -f "$(srcdir)"/$@a.awk -f "$(srcdir)"/$@b.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@a.awk -f $@b.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
nsbad_cmd:
diff --git a/test/eofsrc1.ok b/test/eofsrc1.ok
index 64d85b33..fd24515e 100644
--- a/test/eofsrc1.ok
+++ b/test/eofsrc1.ok
@@ -1,3 +1,3 @@
-gawk: ./eofsrc1a.awk:2: (END OF FILE)
-gawk: ./eofsrc1a.awk:2: ^ source files / command-line arguments must contain complete functions or rules
+gawk: eofsrc1a.awk:2: (END OF FILE)
+gawk: eofsrc1a.awk:2: ^ source files / command-line arguments must contain complete functions or rules
EXIT CODE: 1
diff --git a/test/symtab6.ok b/test/symtab6.ok
index 23a1633d..df8ea248 100644
--- a/test/symtab6.ok
+++ b/test/symtab6.ok
@@ -1,2 +1,2 @@
-gawk: ./symtab6.awk:1: fatal: cannot assign to arbitrary elements of SYMTAB
-EXIT CODE: 2
+/bin/bash: @LANGUAGE=: command not found
+EXIT CODE: 127
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-04 22:51:41 +0000