diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-05-14 22:03:37 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-05-14 22:03:37 +0300 |
| commit | a8b749aa356c6f7bb0facd14220c2c0c14e40e6f (patch) | |
| tree | ac69196d05bfbb14bd0543302fcdc3dfcf9c0d50 /test | |
| parent | e5353c0f447a8628985722296f57fc02dd2e0063 (diff) | |
| parent | 67abdd7a54c00fae450a0f0964a9c9615a8a50c5 (diff) | |
| download | egawk-a8b749aa356c6f7bb0facd14220c2c0c14e40e6f.tar.gz egawk-a8b749aa356c6f7bb0facd14220c2c0c14e40e6f.tar.bz2 egawk-a8b749aa356c6f7bb0facd14220c2c0c14e40e6f.zip | |
Merge branch 'gawk-4.0-stable'
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 11 | ||||
| -rw-r--r-- | test/Makefile.in | 17 |
3 files changed, 20 insertions, 13 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 95bd42dd..7b7da93f 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2012-05-14 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (jarebug): Move to charset tests. Adjust to check + for existence of needed Japanese locale before running the test. + 2012-05-09 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (jarebug): New test. diff --git a/test/Makefile.am b/test/Makefile.am index 726c89ce..457fd163 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -818,7 +818,6 @@ BASIC_TESTS = \ getline getline2 getline3 getline4 getlnbuf getnr2tb getnr2tm \ gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \ gsubtst7 gsubtst8 \ - jarebug \ hex hsprint \ inputred intest intprec iobug1 \ leaddig leadnl litoct longsub longwrds \ @@ -870,7 +869,7 @@ MACHINE_TESTS = double1 double2 fmtspcl intformat MPFR_TESTS = mpfrnr mpfrrnd mpfrieee mpfrexprange mpfrsort mpfrbigint LOCALE_CHARSET_TESTS = \ - asort asorti fmttest fnarydel fnparydl lc_num1 mbfw1 \ + asort asorti fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \ mbprintf1 mbprintf2 mbprintf3 rebt8b2 rtlenmb sort1 sprintfc SHLIB_TESTS = ordchr ordchr2 fork fork2 readfile filefuncs @@ -1534,9 +1533,11 @@ mpfrbigint: jarebug:: @echo $@ - @GAWKLOCALE=ja_JP.EUC-JP ; export GAWKLOCALE ; \ - $(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ + @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 ordchr2:: @echo $@ diff --git a/test/Makefile.in b/test/Makefile.in index fb48935d..2696573a 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -84,9 +84,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libsigsegv.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/longlong.m4 \ - $(top_srcdir)/m4/mpfr.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/mpfr.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/noreturn.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \ $(top_srcdir)/m4/socket.m4 $(top_srcdir)/m4/ulonglong.m4 \ @@ -1050,7 +1050,6 @@ BASIC_TESTS = \ getline getline2 getline3 getline4 getlnbuf getnr2tb getnr2tm \ gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \ gsubtst7 gsubtst8 \ - jarebug \ hex hsprint \ inputred intest intprec iobug1 \ leaddig leadnl litoct longsub longwrds \ @@ -1098,7 +1097,7 @@ INET_TESTS = inetdayu inetdayt inetechu inetecht MACHINE_TESTS = double1 double2 fmtspcl intformat MPFR_TESTS = mpfrnr mpfrrnd mpfrieee mpfrexprange mpfrsort mpfrbigint LOCALE_CHARSET_TESTS = \ - asort asorti fmttest fnarydel fnparydl lc_num1 mbfw1 \ + asort asorti fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \ mbprintf1 mbprintf2 mbprintf3 rebt8b2 rtlenmb sort1 sprintfc SHLIB_TESTS = ordchr ordchr2 fork fork2 readfile filefuncs @@ -1942,9 +1941,11 @@ mpfrbigint: jarebug:: @echo $@ - @GAWKLOCALE=ja_JP.EUC-JP ; export GAWKLOCALE ; \ - $(AWK) -f $(srcdir)/$@.awk $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ + @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 ordchr2:: @echo $@ |