diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-11-24 19:35:51 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-11-24 19:35:51 +0200 |
| commit | a3ad4921f31020b0f2bedc936fcd050ef5c2e698 (patch) | |
| tree | 3b4eff464c4a68d595089b0492497ab3fe6759fe | |
| parent | 531cf0ed26f857c2a2d3b13baf70eae72cefe6f7 (diff) | |
| download | egawk-a3ad4921f31020b0f2bedc936fcd050ef5c2e698.tar.gz egawk-a3ad4921f31020b0f2bedc936fcd050ef5c2e698.tar.bz2 egawk-a3ad4921f31020b0f2bedc936fcd050ef5c2e698.zip | |
Improve portability of spacere test.
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 5 | ||||
| -rw-r--r-- | test/Makefile.in | 10 | ||||
| -rw-r--r-- | test/Maketests | 5 | ||||
| -rw-r--r-- | test/spacere.awk | 2 |
5 files changed, 17 insertions, 11 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index a331619e..522934a4 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2018-11-24 Arnold D. Robbins <arnold@skeeve.com> + + * spacere.awk: Move setting of LC_ALL=C out to ... + * Makefile.am (spacere): ... here. Added test. + Per request from Eli Zaretskii to help porting to MinGW. + 2018-10-10 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (profile1): Add minus to ignore errors on final diff --git a/test/Makefile.am b/test/Makefile.am index 171a7620..5ca312c2 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2215,6 +2215,11 @@ longwrds: @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +spacere: + @echo $@ + @LC_ALL=C AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + # Targets generated for other tests: include Maketests diff --git a/test/Makefile.in b/test/Makefile.in index 74e8b3d2..8a66e7b8 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2658,6 +2658,11 @@ longwrds: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk -v SORT="$(SORT)" < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + +spacere: + @echo $@ + @LC_ALL=C AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: @@ -3661,11 +3666,6 @@ sortglos: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -spacere: - @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - splitargv: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/Maketests b/test/Maketests index fd6a2713..65f0197c 100644 --- a/test/Maketests +++ b/test/Maketests @@ -1001,11 +1001,6 @@ sortglos: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -spacere: - @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - splitargv: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/spacere.awk b/test/spacere.awk index 6aa87d2e..ba959309 100644 --- a/test/spacere.awk +++ b/test/spacere.awk @@ -8,7 +8,7 @@ BEGIN { c["\t"] = "\\t" c["\v"] = "\\v" - sort = "LC_ALL=C sort" + sort = "sort" for (i in c) printf("%s %s [[:space:]]\n", c[i], |