aboutsummaryrefslogtreecommitdiffstats
path: root/pc
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2014-11-13 20:31:20 +0200
committerArnold D. Robbins <arnold@skeeve.com>2014-11-13 20:31:20 +0200
commitaf9cde0a7cf69800ac3ec581a7c2422e955b9a3c (patch)
tree44ce3e5adfdea6137517eb3c5cd01c4229f3d7a5 /pc
parent20b2458ba07a9190cfd5bc942da604482036a5b0 (diff)
parent05de499531bc8fece2625b27a728bd24412ab41a (diff)
downloadegawk-af9cde0a7cf69800ac3ec581a7c2422e955b9a3c.tar.gz
egawk-af9cde0a7cf69800ac3ec581a7c2422e955b9a3c.tar.bz2
egawk-af9cde0a7cf69800ac3ec581a7c2422e955b9a3c.zip
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'pc')
-rw-r--r--pc/ChangeLog4
-rw-r--r--pc/Makefile.tst27
2 files changed, 27 insertions, 4 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog
index e22cb01a..03159c1e 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-13 Scott Deifik <scottd.mail@sbcglobal.net>
+
+ * Makefile.tst: Sync with mainline.
+
2014-10-12 KO Myung-Hun <komh78@gmail.com>
Fixes for OS/2:
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 48fc5189..8ab15987 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -183,7 +183,7 @@ GAWK_EXT_TESTS = \
colonwarn clos1way dbugeval delsub devfd devfd1 devfd2 dumpvars exit \
fieldwdth fpat1 fpat2 fpat3 fpatnull fsfwfs funlen \
functab1 functab2 functab3 fwtest fwtest2 fwtest3 \
- gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
+ genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
icasefs icasers id igncdym igncfs ignrcas2 ignrcase \
incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
include include2 indirectcall indirectcall2 \
@@ -191,7 +191,7 @@ GAWK_EXT_TESTS = \
manyfiles match1 match2 match3 mbstr1 \
nastyparm next nondec nondec2 \
patsplit posix printfbad1 printfbad2 printfbad3 printhuge procinfs \
- profile1 profile2 profile3 profile4 profile5 pty1 \
+ profile1 profile2 profile3 profile4 profile5 profile6 profile7 pty1 \
rebuf regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin rsstart1 \
rsstart2 rsstart3 rstest6 shadow sortfor sortu split_after_fpat \
splitarg4 strftime \
@@ -322,6 +322,8 @@ charset-msg-start:
@echo "************************************************"
@echo "** Some or all of these tests may fail if you **"
@echo "** have inadequate or missing locale support **"
+ @echo "** At least en_US.UTF-8, ru_RU.UTF-8 and **"
+ @echo "** ja_JP.UTF-8 are needed. **"
@echo "************************************************"
charset-msg-end:
@@ -861,7 +863,7 @@ dumpvars::
profile1:
@echo $@
@$(AWK) --pretty-print=ap-$@.out -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > _$@.out1
- @$(AWK) -f ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
+ @$(AWK) -f ./ap-$@.out "$(srcdir)"/dtdgport.awk > _$@.out2 ; rm ap-$@.out
@$(CMP) _$@.out1 _$@.out2 && rm _$@.out[12] || { echo EXIT CODE: $$? >>_$@ ; \
cp "$(srcdir)"/dtdgport.awk > $@.ok ; }
@@ -890,6 +892,18 @@ profile5:
@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+profile6:
+ @echo $@
+ @$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
+ @sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+profile7:
+ @echo $@
+ @$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
+ @sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
posix2008sub:
@echo $@
@$(AWK) --posix -f "$(srcdir)"/$@.awk > _$@ 2>&1
@@ -1055,7 +1069,7 @@ testext::
@echo $@
# @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
@$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > testext.awk
- @$(AWK) -f testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk
readdir:
@@ -1176,6 +1190,11 @@ filefuncs:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v builddir="$(abs_top_builddir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+genpot:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --gen-pot >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
Gt-dummy:
# file Maketests, generated from Makefile.am by the Gentests program
addcomma: