diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-08-26 21:49:01 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-08-26 21:49:01 +0300 |
| commit | 8e34526a147a2e07c08c950b9f28c2e2132b6fd3 (patch) | |
| tree | 9e0403805aedaa4e04614930d7f8b3fafe2d07fa /test | |
| parent | 3c09996d7efa635947c357efb3ccc5ed05b1ea31 (diff) | |
| parent | 439d946a0e936267f7f478b22d0754e882bf7cf0 (diff) | |
| download | egawk-8e34526a147a2e07c08c950b9f28c2e2132b6fd3.tar.gz egawk-8e34526a147a2e07c08c950b9f28c2e2132b6fd3.tar.bz2 egawk-8e34526a147a2e07c08c950b9f28c2e2132b6fd3.zip | |
Merge branch 'gawk-4.0-stable'
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/charasbytes.ok | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 5414bfce..680954ed 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2012-08-26 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (charasbytes): Revise test to canonicalize + whitespace. (For Mac OS X 10.5, at least.) + * charasbytes.ok: Updated. + 2012-08-23 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (revout, revtwoway): New tests. diff --git a/test/Makefile.am b/test/Makefile.am index ef833ef4..5f62852d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1661,7 +1661,7 @@ charasbytes: @echo $@ @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \ AWKPATH=$(srcdir) $(AWK) -b -f $@.awk $(srcdir)/$@.in | \ - od -c -t x1 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + od -c -t x1 | sed -e 's/ */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ # Targets generated for other tests: diff --git a/test/Makefile.in b/test/Makefile.in index c4b1bb60..35c7b201 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2043,7 +2043,7 @@ charasbytes: @echo $@ @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \ AWKPATH=$(srcdir) $(AWK) -b -f $@.awk $(srcdir)/$@.in | \ - od -c -t x1 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + od -c -t x1 | sed -e 's/ */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program diff --git a/test/charasbytes.ok b/test/charasbytes.ok index a1702e64..f60f2ab4 100644 --- a/test/charasbytes.ok +++ b/test/charasbytes.ok @@ -1,3 +1,3 @@ -0000000 Z Z Z \n - 5a 5a 5a 0a +0000000 Z Z Z \n + 5a 5a 5a 0a 0000004 |