aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2012-11-04 16:07:40 +0200
committerArnold D. Robbins <arnold@skeeve.com>2012-11-04 16:07:40 +0200
commit5bbfd2aea95c6fcc0a0a326bebce6d9ada2bfb53 (patch)
tree8c65a68582b4aacdf2cd197e4516502843f846c7
parent2204f38c05fef5747b8f6764a202b646f4126338 (diff)
parentf8998c45dffcbbd874038f7e19515a504834f3cd (diff)
downloadegawk-5bbfd2aea95c6fcc0a0a326bebce6d9ada2bfb53.tar.gz
egawk-5bbfd2aea95c6fcc0a0a326bebce6d9ada2bfb53.tar.bz2
egawk-5bbfd2aea95c6fcc0a0a326bebce6d9ada2bfb53.zip
Merge branch 'gawk-4.0-stable'
-rw-r--r--pc/ChangeLog4
-rw-r--r--pc/Makefile.tst6
2 files changed, 9 insertions, 1 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 5258c098..0defb81a 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-04 Scott Deifik <scottd.mail@sbcglobal.net>
+
+ * Makefile.tst (jarebug, charasbytes): Update.
+
2012-10-28 Scott Deifik <scottd.mail@sbcglobal.net>
* Makefile.tst: Sync with mainline version.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 12bdf2d8..09baaf32 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -842,13 +842,17 @@ rri1::
jarebug::
@echo $@
+ @echo Expect jarebug to fail with DJGPP.
@$(srcdir)/$@.sh "$(AWKPROG)" "$(srcdir)/$@.awk" "$(srcdir)/$@.in" "_$@"
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
charasbytes:
@echo $@
+# @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+# AWKPATH=$(srcdir) $(AWK) -b -f $@.awk $(srcdir)/$@.in | \
+# od -c -t x1 | sed -e 's/ */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
- AWKPATH=$(srcdir) $(AWK) -b -f $@.awk $(srcdir)/$@.in | \
+ AWKPATH=$(srcdir) $(AWK) -b -v BINMODE=2 -f $@.awk $(srcdir)/$@.in | \
od -c -t x1 | sed -e 's/ */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
Gt-dummy: