aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2013-10-30 21:32:01 +0200
committerArnold D. Robbins <arnold@skeeve.com>2013-10-30 21:32:01 +0200
commit40e7cd90d7efebb47f9d13d15f622a511e9ed304 (patch)
treea18bd4e5c4de592dd86e160d59341ca1e5d97839
parent13f1e85d9e0afc5ad03d0cb0a4dcab14cf9e4a29 (diff)
downloadegawk-40e7cd90d7efebb47f9d13d15f622a511e9ed304.tar.gz
egawk-40e7cd90d7efebb47f9d13d15f622a511e9ed304.tar.bz2
egawk-40e7cd90d7efebb47f9d13d15f622a511e9ed304.zip
Make charasbytes test more robust. We hope.
-rw-r--r--test/ChangeLog2
-rw-r--r--test/Makefile.am3
-rw-r--r--test/Makefile.in2
3 files changed, 4 insertions, 3 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 55430ef4..6efd6ef5 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -3,6 +3,8 @@
* Makefile.am (pipeio3): Enhance test, again, to be more resilient
to variations in error messages produced by different Bourne shells
when a command is not found. This time for Cygwin.
+ (charasbytes): Translit any tabs to spaces. Should help on
+ some System V systems such as Solaris. We hope.
2013-10-22 Arnold D. Robbins <arnold@skeeve.com>
diff --git a/test/Makefile.am b/test/Makefile.am
index 04c25dfe..21f4ef7f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1825,10 +1825,9 @@ 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: $$? >>_$@
+ od -c -t x1 | tr ' ' ' ' | sed -e 's/ */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
symtab6:
@echo $@
@$(AWK) -d__$@ -f "$(srcdir)"/$@.awk
diff --git a/test/Makefile.in b/test/Makefile.in
index 26db046d..7e55db72 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2220,7 +2220,7 @@ 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: $$? >>_$@
+ od -c -t x1 | tr ' ' ' ' | sed -e 's/ */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
symtab6: