diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-05-14 21:36:46 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-05-14 21:36:46 +0300 |
| commit | 67abdd7a54c00fae450a0f0964a9c9615a8a50c5 (patch) | |
| tree | 4dee97535f49c13a4310bbe282fbea28f6f5f15f | |
| parent | ae93fda5ed5957fb62e2b6f0cd6f104c7009b2ee (diff) | |
| download | egawk-67abdd7a54c00fae450a0f0964a9c9615a8a50c5.tar.gz egawk-67abdd7a54c00fae450a0f0964a9c9615a8a50c5.tar.bz2 egawk-67abdd7a54c00fae450a0f0964a9c9615a8a50c5.zip | |
Fix jarebug test.
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 11 | ||||
| -rw-r--r-- | test/Makefile.in | 11 |
3 files changed, 17 insertions, 10 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 4537f059..97065a2d 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 3987b4e0..24255b7e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -804,7 +804,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 \ @@ -854,7 +853,7 @@ INET_TESTS = inetdayu inetdayt inetechu inetecht MACHINE_TESTS = double1 double2 fmtspcl intformat 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 # List of the tests which should be run with --lint option: @@ -1457,9 +1456,11 @@ rri1:: 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 # Targets generated for other tests: diff --git a/test/Makefile.in b/test/Makefile.in index 36287353..709009e8 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1009,7 +1009,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 \ @@ -1056,7 +1055,7 @@ EXTRA_TESTS = inftest regtest INET_TESTS = inetdayu inetdayt inetechu inetecht MACHINE_TESTS = double1 double2 fmtspcl intformat 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 @@ -1835,9 +1834,11 @@ rri1:: 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 Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: |