diff options
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 12 | ||||
| -rw-r--r-- | test/Makefile.in | 12 |
3 files changed, 19 insertions, 10 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index a0f72bca..bf16b002 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,5 +1,10 @@ 2016-08-01 Arnold D. Robbins <arnold@skeeve.com> + * Makefile.am (ignrcas3): Adjust to check that the el_GR.xxx locale + is present. Move it to extra tests so it's not run by default. + +2016-08-02 Arnold D. Robbins <arnold@skeeve.com> + * Makefile.am (sortfor2): New test. * sortfor2.awk, sortfor2.in, sortfor2.ok: New files. Thanks Christian Schneider <software@chschneider.eu> diff --git a/test/Makefile.am b/test/Makefile.am index fbaf23ea..e27dcf65 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1117,7 +1117,7 @@ GAWK_EXT_TESTS = \ fieldwdth fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \ functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops \ - icasefs icasers id igncdym igncfs ignrcas2 ignrcas3 ignrcase \ + icasefs icasers id igncdym igncfs ignrcas2 ignrcase \ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \ include include2 indirectbuiltin indirectcall indirectcall2 \ lint lintold lintwarn \ @@ -1134,7 +1134,7 @@ GAWK_EXT_TESTS = \ symtab7 symtab8 symtab9 symtab10 \ watchpoint1 -EXTRA_TESTS = inftest regtest +EXTRA_TESTS = inftest regtest ignrcas3 INET_TESTS = inetdayu inetdayt inetechu inetecht @@ -2183,9 +2183,11 @@ symtab10: ignrcas3:: @echo $@ - @GAWKLOCALE=el_GR.iso88597 \ - AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + @if locale -a | grep el_GR.iso88597 > /dev/null ; then \ + GAWKLOCALE=el_GR.iso88597 \ + AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ + $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \ + fi # Targets generated for other tests: include Maketests diff --git a/test/Makefile.in b/test/Makefile.in index 40da1e17..0a5595ba 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1373,7 +1373,7 @@ GAWK_EXT_TESTS = \ fieldwdth fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \ functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops \ - icasefs icasers id igncdym igncfs ignrcas2 ignrcas3 ignrcase \ + icasefs icasers id igncdym igncfs ignrcas2 ignrcase \ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \ include include2 indirectbuiltin indirectcall indirectcall2 \ lint lintold lintwarn \ @@ -1390,7 +1390,7 @@ GAWK_EXT_TESTS = \ symtab7 symtab8 symtab9 symtab10 \ watchpoint1 -EXTRA_TESTS = inftest regtest +EXTRA_TESTS = inftest regtest ignrcas3 INET_TESTS = inetdayu inetdayt inetechu inetecht MACHINE_TESTS = double1 double2 fmtspcl intformat MPFR_TESTS = mpfrnr mpfrnegzero mpfrmemok1 mpfrrem mpfrrnd mpfrieee \ @@ -2622,9 +2622,11 @@ symtab10: ignrcas3:: @echo $@ - @GAWKLOCALE=el_GR.iso88597 \ - AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + @if locale -a | grep el_GR.iso88597 > /dev/null ; then \ + GAWKLOCALE=el_GR.iso88597 \ + AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ + $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \ + fi Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: |