diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-05-20 21:03:52 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-05-20 21:03:52 +0300 |
| commit | f8ec28a30e98cad325d18478a3d054b8c30a3129 (patch) | |
| tree | b50f08a79d4bf32c8fcb3cd2d749f0a1b6691192 | |
| parent | ac950a04867fce7784680ba76d654d910e88a8cd (diff) | |
| download | egawk-f8ec28a30e98cad325d18478a3d054b8c30a3129.tar.gz egawk-f8ec28a30e98cad325d18478a3d054b8c30a3129.tar.bz2 egawk-f8ec28a30e98cad325d18478a3d054b8c30a3129.zip | |
Enhance jarebug for Mac OS X.
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 7 | ||||
| -rw-r--r-- | test/Makefile.in | 7 | ||||
| -rwxr-xr-x | test/jarebug.sh | 21 |
4 files changed, 30 insertions, 10 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 70dacf48..06d9020f 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2012-05-20 Arnold D. Robbins <arnold@skeeve.com> + + * jarebug.sh: New file. Handles Mac OS X also. + * Makefile.am (jarebug): Use jarebug.sh to run the test. + 2012-05-16 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (jarebug): Remove leading `-' from $(CMP) line. diff --git a/test/Makefile.am b/test/Makefile.am index 5102d405..5ff35012 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1456,11 +1456,8 @@ rri1:: jarebug:: @echo $@ - @if locale -a | grep ja_JP.EUC-JP > /dev/null ; then \ - GAWKLOCALE=ja_JP.EUC-JP ; export GAWKLOCALE ; \ - $(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@ ; \ - $(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ ; \ - fi + @$(srcdir)/$@.sh "$(AWKPROG)" "$(srcdir)/$@.awk" "$(srcdir)/$@.in" "_$@" + @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ # Targets generated for other tests: diff --git a/test/Makefile.in b/test/Makefile.in index 4c368127..171428bb 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1834,11 +1834,8 @@ rri1:: jarebug:: @echo $@ - @if locale -a | grep ja_JP.EUC-JP > /dev/null ; then \ - GAWKLOCALE=ja_JP.EUC-JP ; export GAWKLOCALE ; \ - $(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@ ; \ - $(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ ; \ - fi + @$(srcdir)/$@.sh "$(AWKPROG)" "$(srcdir)/$@.awk" "$(srcdir)/$@.in" "_$@" + @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: diff --git a/test/jarebug.sh b/test/jarebug.sh new file mode 100755 index 00000000..dcc73e6c --- /dev/null +++ b/test/jarebug.sh @@ -0,0 +1,21 @@ +#! /bin/sh + +awk=$1 +prog=$2 +infile=$3 +out=$4 + +# GLIBC gives us ja_JP.EUC-JP but Mac OS X uses ja_JP.eucJP + +cp $infile $out # set up default + +for locale in ja_JP.EUC-JP ja_JP.eucJP +do + if locale -a | grep $locale > /dev/null + then + LANG=$locale + LC_ALL=$locale + export LANG LC_ALL + $awk -f $prog $infile >$out 2>&1 || echo EXIT CODE: $? >> $out + fi +done |