diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2013-10-30 21:32:53 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2013-10-30 21:32:53 +0200 |
| commit | cb76bbdd0ecd2990900e6c0b68b166425f8df6fd (patch) | |
| tree | 1c33b603cb8b4c65b692dfccaaaf47dafdb890b3 /test | |
| parent | 7f05df29849820b78f0537a8e7295509d4bd7726 (diff) | |
| parent | 40e7cd90d7efebb47f9d13d15f622a511e9ed304 (diff) | |
| download | egawk-cb76bbdd0ecd2990900e6c0b68b166425f8df6fd.tar.gz egawk-cb76bbdd0ecd2990900e6c0b68b166425f8df6fd.tar.bz2 egawk-cb76bbdd0ecd2990900e6c0b68b166425f8df6fd.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 14 | ||||
| -rw-r--r-- | test/Makefile.am | 5 | ||||
| -rw-r--r-- | test/Makefile.in | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 53b9aaf6..f011bba4 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,8 +1,16 @@ +2013-10-30 Arnold D. Robbins <arnold@skeeve.com> + + * 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> - * Makefile.am (pipeio3): Enhance test to be more resilient to variations - in error messages produced by different Bourne shells when a command - is not found. + * Makefile.am (pipeio3): Enhance test to be more resilient to + variations in error messages produced by different Bourne shells + when a command is not found. Initially for Mac OS X. 2013-10-17 Arnold D. Robbins <arnold@skeeve.com> diff --git a/test/Makefile.am b/test/Makefile.am index 118be1d8..179c5e0d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1827,10 +1827,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 @@ -1893,7 +1892,7 @@ backsmalls1: pipeio3: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @sed 's/sh.*cart:.*not found/sh: 1: cart: not found/' < _$@ >_x$@ ; mv _x$@ _$@ + @sed 's/.*sh.*cart:.*not found/sh: 1: cart: not found/' < _$@ >_x$@ ; mv _x$@ _$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ # Targets generated for other tests: diff --git a/test/Makefile.in b/test/Makefile.in index dfd9ad89..55cd3af5 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2222,7 +2222,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: @@ -2286,7 +2286,7 @@ backsmalls1: pipeio3: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @sed 's/sh.*cart:.*not found/sh: 1: cart: not found/' < _$@ >_x$@ ; mv _x$@ _$@ + @sed 's/.*sh.*cart:.*not found/sh: 1: cart: not found/' < _$@ >_x$@ ; mv _x$@ _$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program |