summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-01-15 18:47:28 +0200
committerEli Zaretskii <eliz@gnu.org>2014-01-15 18:47:28 +0200
commit699b3a96bfcdd281b4f0db447fcf80ba7fbc6ec6 (patch)
tree27265c8b3fa264b56b91a5884ed5b9ff658437e7
parent9175c4e1b26dbdac5600df0b4d33717004c9a434 (diff)
downloadgawk-699b3a96bfcdd281b4f0db447fcf80ba7fbc6ec6.tar.gz
Fix pc/Makefile.tst per the changes in the test suite.
* pc/Makefile.tst (mbprintf4, profile5, backbigs1, backsmalls1): Announce expected failures. (fts): Fail gracefully, to avoid bailing out of the test suite too early.
-rw-r--r--pc/ChangeLog5
-rw-r--r--pc/Makefile.tst6
2 files changed, 10 insertions, 1 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog
index bd9c8c60..12bf2f89 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,5 +1,10 @@
2014-01-15 Eli Zaretskii <eliz@gnu.org>
+ * Makefile.tst (mbprintf4, profile5, backbigs1, backsmalls1):
+ Announce expected failures.
+ (fts): Fail gracefully, to avoid bailing out of the test suite too
+ early.
+
* popen.c (os_system): Use spawnl, and quote the command line, to
be consistent with what gawk_popen does.
(os_popen) [__MINGW32__]: Don't scriptify the command, to be
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 6a2216a0..2cff3c2e 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -797,6 +797,7 @@ mbprintf3::
mbprintf4::
@echo $@
+ @echo Expect mbprintf4 to fail with MinGW
@GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
$(AWK) -f "$(srcdir)"/$@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -870,6 +871,7 @@ profile4:
profile5:
@echo $@
+ @echo Expect profile5 to fail with MinGW due to 3 digits in %e output
@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 _$@
@@ -1041,7 +1043,7 @@ fts:
fi
@echo $@
@echo Expect $@ to fail with MinGW because function 'fts' is not defined.
- @$(AWK) -f "$(srcdir)"/fts.awk
+ @$(AWK) -f "$(srcdir)"/fts.awk || echo EXIT CODE: $$? >>_$@
@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
charasbytes:
@@ -1098,12 +1100,14 @@ dfamb1:
backbigs1:
@echo $@
+ @echo Expect backbigs1 to fail with MinGW
@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
backsmalls1:
@echo $@
+ @echo Expect backsmalls1 to fail with MinGW
@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@