aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog5
-rw-r--r--test/Makefile.am11
-rw-r--r--test/Makefile.in11
3 files changed, 17 insertions, 10 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 94c6ef18..d0d7799e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -111,6 +111,11 @@
* hello.awk, incdupe.ok, incdupe2.ok, incdupe3.ok, inclib.awk,
include.awk, include.ok, include2.ok: New files.
+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 c067f669..d7af60b1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -844,7 +844,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 \
@@ -898,7 +897,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 = \
@@ -1564,9 +1563,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 10d7b6a5..b82d13c5 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1057,7 +1057,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 \
@@ -1107,7 +1106,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 = \
@@ -1947,9 +1946,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 $@