From b49f18335837eed25c1ef823d2ccb88c8c3b9e97 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Fri, 17 Aug 2012 13:17:33 +0300 Subject: Update infrastructure. --- test/Makefile.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/Makefile.in b/test/Makefile.in index d76d7387..5c268a9a 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.12 from Makefile.am. +# Makefile.in generated by automake 1.12.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -- cgit v1.2.3 From 439d946a0e936267f7f478b22d0754e882bf7cf0 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Sun, 26 Aug 2012 21:42:53 +0300 Subject: Fix charasbytes test for Mac OS X (10.5). --- test/ChangeLog | 6 ++++++ test/Makefile.am | 2 +- test/Makefile.in | 2 +- test/charasbytes.ok | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/ChangeLog b/test/ChangeLog index 75eb5ec9..f88b7963 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2012-08-26 Arnold D. Robbins + + * Makefile.am (charasbytes): Revise test to canonicalize + whitespace. (For Mac OS X 10.5, at least.) + * charasbytes.ok: Updated. + 2012-08-12 Arnold D. Robbins * Makefile.am (regexprange): New test. diff --git a/test/Makefile.am b/test/Makefile.am index 592cf144..bb61bcaf 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1474,7 +1474,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 5c268a9a..91652f08 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1851,7 +1851,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 -- cgit v1.2.3