aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pc/ChangeLog9
-rw-r--r--pc/Makefile.tst37
-rw-r--r--pc/config.h6
-rw-r--r--pc/config.sed8
-rw-r--r--test/ChangeLog4
-rw-r--r--test/Makefile.am2
-rw-r--r--test/Makefile.in2
7 files changed, 45 insertions, 23 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog
index d71fdc11..c2e0e986 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,12 @@
+2016-04-17 Scott Deifik <scottd.mail@sbcglobal.net>
+
+ * Makefile.tst: Sync with mainline.
+
+2016-04-16 Eli Zaretskii <eliz@gnu.org>
+
+ * config.sed (HAVE_BTOWC): Now unconditionally defined to 1.
+ (HAVE_SYS_WAIT_H): Define to 1 for DJGPP.
+
2016-04-08 Eli Zaretskii <eliz@gnu.org>
* Makefile.tst (BASIC_TESTS, GAWK_EXT_TESTS): Add new tests.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index a8c1f529..9d0cfdcf 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -165,7 +165,8 @@ BASIC_TESTS = \
paramdup paramres paramtyp paramuninitglobal parse1 parsefld parseme \
pcntplus posix2008sub prdupval prec printf0 printf1 prmarscl prmreuse \
prt1eval prtoeval \
- rand range1 rebrackloc rebt8b1 redfilnm regeq regexpbrack regexpbrack2 \
+ rand range1 readbuf rebrackloc rebt8b1 redfilnm \
+ regeq regexpbrack regexpbrack2 \
regexprange regrange reindops \
reparse resplit rri1 rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \
rstest3 rstest4 rstest5 rswhite \
@@ -220,6 +221,7 @@ SHLIB_TESTS = \
fnmatch filefuncs fork fork2 fts functab4 inplace1 inplace2 inplace3 \
ordchr ordchr2 readdir readfile readfile2 revout revtwoway rwarray testext time
+
# List of the tests which should be run with --lint option:
NEED_LINT = \
defref fmtspcl lintwarn noeffect nofmtch shadow \
@@ -272,6 +274,7 @@ charset-tests-all:
$(MAKE) charset-msg-start charset-tests charset-msg-end; \
else \
echo %%%%%%%%%% Inadequate locale support: skipping charset tests. ; \
+ echo %%%%%%%%%% At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \
fi
charset-tests: $(LOCALE_CHARSET_TESTS)
@@ -338,7 +341,7 @@ charset-msg-start:
@echo "======== Starting tests that can vary based on character set or locale support ========"
@echo "**************************************************************************"
@echo "* Some or all of these tests may fail if you have inadequate or missing *"
- @echo "* locale support At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are *"
+ @echo "* locale support. At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are *"
@echo "* needed. However, if you see this message, the Makefile thinks you have *"
@echo "* what you need ... *"
@echo "**************************************************************************"
@@ -853,6 +856,7 @@ mbstr1::
@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
mbstr2::
@echo $@
@echo Expect mbstr2 to fail with MinGW.
@@ -916,7 +920,7 @@ profile4:
profile5:
@echo $@
- @-GAWK_NO_PP_RUN=1 $(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
+ @GAWK_NO_PP_RUN=1 $(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
# @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@-$(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -1252,7 +1256,7 @@ paramasfunc2::
negtime::
@echo $@
@TZ=GMT AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @AWKPATH="$(srcdir)" $(AWK) -f checknegtime.awk $@.ok _$@ && rm -f _$@
+ @AWKPATH="$(srcdir)" $(AWK) -f checknegtime.awk "$(srcdir)"/$@.ok _$@ && rm -f _$@
muldimposix::
@echo $@
@@ -1261,8 +1265,17 @@ muldimposix::
watchpoint1:
@echo $@
- @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk $@.in < $@.script >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk $(srcdir)/$@.in < $(srcdir)/$@.script >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+pty1:
+ @echo $@
+ @echo Expect pty1 to fail with DJGPP and MinGW.
+ @case `uname` in \
+ *[Oo][Ss]/390*) : ;; \
+ *) AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
+ $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \
+ esac
Gt-dummy:
# file Maketests, generated from Makefile.am by the Gentests program
addcomma:
@@ -2527,12 +2540,6 @@ procinfs:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-pty1:
- @echo $@
- @echo Expect pty1 to fail with DJGPP and MinGW.
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
regnul1:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2735,11 +2742,11 @@ time:
# Targets generated for other tests:
-$(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
+Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
files=`cd "$(srcdir)" && echo *.awk *.in`; \
- $(AWK) -f "$(srcdir)"/Gentests "$(srcdir)"/Makefile.am $$files > "$(srcdir)"/Maketests
+ $(AWK) -f "$(srcdir)"/Gentests "$(srcdir)"/Makefile.am $$files > $@
-clean:
+clean-local:
rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \
seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \
mmap8k.ok profile1.ok
@@ -2766,7 +2773,7 @@ diffout:
diff -c "$(srcdir)"/$${base}.ok $$i ; \
fi ; \
fi ; \
- done | less
+ done | more
# convenient way to scan valgrind results for errors
valgrind-scan:
diff --git a/pc/config.h b/pc/config.h
index 09572ada..1131414e 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -27,9 +27,7 @@
#define HAVE_ATEXIT 1
/* Define to 1 if you have the `btowc' function. */
-#ifdef _WIN32
#define HAVE_BTOWC 1
-#endif
/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
@@ -331,7 +329,9 @@
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
+#ifdef __DJGPP__
+#define HAVE_SYS_WAIT_H 1
+#endif
/* Define to 1 if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H
diff --git a/pc/config.sed b/pc/config.sed
index 024abab8..6d801e77 100644
--- a/pc/config.sed
+++ b/pc/config.sed
@@ -39,9 +39,7 @@ s/^#undef GETGROUPS_T *$/#define GETGROUPS_T gid_t/
s/^#undef HAVE_ALARM *$/#define HAVE_ALARM 1/
s/^#undef HAVE_ATEXIT *$/#define HAVE_ATEXIT 1/
/^#undef HAVE_BTOWC *$/c\
-#ifdef _WIN32\
-#define HAVE_BTOWC 1\
-#endif
+#define HAVE_BTOWC 1
/^#undef HAVE_DECL_TZNAME *$/c\
#ifdef __MINGW32__\
#define HAVE_DECL_TZNAME 1\
@@ -182,6 +180,10 @@ s/^#undef HAVE_SYSTEM *$/#define HAVE_SYSTEM 1/
#define HAVE_SYS_TIME_H 1\
#endif
s/^#undef HAVE_SYS_TYPES_H *$/#define HAVE_SYS_TYPES_H 1/
+/^#undef HAVE_SYS_WAIT_H *$/c\
+#ifdef __DJGPP__\
+#define HAVE_SYS_WAIT_H 1\
+#endif
/^#undef HAVE_TOWLOWER *$/c\
#ifdef __MINGW32__\
#define HAVE_TOWLOWER 1\
diff --git a/test/ChangeLog b/test/ChangeLog
index 65c60388..ab4849dd 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-17 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (pty1): Really disable test on z/OS.
+
2016-04-11 Arnold D. Robbins <arnold@skeeve.com>
* clos1way2.ok, clos1way3.ok, clos1way4.ok, clos1way5.ok: Update
diff --git a/test/Makefile.am b/test/Makefile.am
index b0b24b7d..c2efb066 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2227,7 +2227,7 @@ watchpoint1:
pty1:
@echo $@
@case `uname` in \
- openedition*) : ;; \
+ *[Oo][Ss]/390*) : ;; \
*) AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \
esac
diff --git a/test/Makefile.in b/test/Makefile.in
index 8eaa7299..d3065fa0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2665,7 +2665,7 @@ watchpoint1:
pty1:
@echo $@
@case `uname` in \
- openedition*) : ;; \
+ *[Oo][Ss]/390*) : ;; \
*) AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \
esac
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 05:37:53 +0000