diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2016-08-02 20:53:24 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2016-08-02 20:53:24 +0300 |
| commit | 14587bf02200b8f184f19f52bbff83973d9d9197 (patch) | |
| tree | e204adc59a44677f911cd506d76b112088a9f8aa /test | |
| parent | f94d8d12596abd2e48d5131190cb5f643ac03e55 (diff) | |
| parent | 58cd470fe6b37ff2b62f5bc5b8cedf19be04fc63 (diff) | |
| download | egawk-14587bf02200b8f184f19f52bbff83973d9d9197.tar.gz egawk-14587bf02200b8f184f19f52bbff83973d9d9197.tar.bz2 egawk-14587bf02200b8f184f19f52bbff83973d9d9197.zip | |
Merge branch 'master' into feature/nocopy
Diffstat (limited to 'test')
| -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 e57e6019..c55eae70 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 612c256e..7823cebf 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1207,7 +1207,7 @@ GAWK_EXT_TESTS = \ fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \ functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops gsubind \ - icasefs icasers id igncdym igncfs ignrcas2 ignrcas3 ignrcas4 ignrcase \ + icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \ include include2 indirectbuiltin indirectcall indirectcall2 intarray \ lint lintexp lintindex lintint lintlength lintold lintset lintwarn \ @@ -1228,7 +1228,7 @@ GAWK_EXT_TESTS = \ timeout \ watchpoint1 -EXTRA_TESTS = inftest regtest +EXTRA_TESTS = inftest regtest ignrcas3 INET_TESTS = inetdayu inetdayt inetechu inetecht @@ -2336,9 +2336,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 008a4042..fd600326 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1463,7 +1463,7 @@ GAWK_EXT_TESTS = \ fieldwdth forcenum fpat1 fpat2 fpat3 fpat4 fpat5 fpatnull fsfwfs funlen \ functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops gsubind \ - icasefs icasers id igncdym igncfs ignrcas2 ignrcas3 ignrcas4 ignrcase \ + icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \ incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \ include include2 indirectbuiltin indirectcall indirectcall2 intarray \ lint lintexp lintindex lintint lintlength lintold lintset lintwarn \ @@ -1484,7 +1484,7 @@ GAWK_EXT_TESTS = \ timeout \ 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 \ @@ -2774,9 +2774,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: |