diff options
| -rw-r--r-- | test/ChangeLog | 7 | ||||
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 9 | ||||
| -rw-r--r-- | test/Maketests | 5 | ||||
| -rw-r--r-- | test/spacere.awk | 22 | ||||
| -rw-r--r-- | test/spacere.ok | 16 |
6 files changed, 60 insertions, 3 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 9c55a48d..3f22e1ce 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2018-05-23 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (EXTRA_DIST): Add files for spacere. + * spacere.awk, spacere.ok: New files. + 2018-05-12 Eli Zaretskii <eliz@gnu.org> * Makefile.am (readfile): Fix a typo. @@ -168,7 +173,7 @@ * Makefile.am (EXTRA_DIST): Add files for mpfrfield. (MPFR_TESTS): Add mpfrfield. - * mpfrfield.awk, mpfrfield.awk, mpfrfield.ok: New files. + * mpfrfield.awk, mpfrfield.in, mpfrfield.ok: New files. 2018-03-26 Arnold D. Robbins <arnold@skeeve.com> diff --git a/test/Makefile.am b/test/Makefile.am index 61b98c2e..af0d47d9 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1051,6 +1051,8 @@ EXTRA_DIST = \ sortu.ok \ sourcesplit.ok \ space.ok \ + spacere.awk \ + spacere.ok \ split_after_fpat.awk \ split_after_fpat.in \ split_after_fpat.ok \ @@ -1257,7 +1259,7 @@ BASIC_TESTS = \ rri1 rs rscompat rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 rstest3 \ rstest4 rstest5 rswhite \ scalar sclforin sclifin setrec0 setrec1 \ - sigpipe1 sortempty sortglos splitargv splitarr \ + sigpipe1 sortempty sortglos spacere splitargv splitarr \ splitdef splitvar splitwht status-close strcat1 strnum1 strnum2 strtod \ subamp subback subi18n subsepnm subslash substr swaplns synerr1 synerr2 \ tailrecurse tradanch tweakfld \ diff --git a/test/Makefile.in b/test/Makefile.in index 78606f86..edf4d646 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1309,6 +1309,8 @@ EXTRA_DIST = \ sortu.ok \ sourcesplit.ok \ space.ok \ + spacere.awk \ + spacere.ok \ split_after_fpat.awk \ split_after_fpat.in \ split_after_fpat.ok \ @@ -1515,7 +1517,7 @@ BASIC_TESTS = \ rri1 rs rscompat rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 rstest3 \ rstest4 rstest5 rswhite \ scalar sclforin sclifin setrec0 setrec1 \ - sigpipe1 sortempty sortglos splitargv splitarr \ + sigpipe1 sortempty sortglos spacere splitargv splitarr \ splitdef splitvar splitwht status-close strcat1 strnum1 strnum2 strtod \ subamp subback subi18n subsepnm subslash substr swaplns synerr1 synerr2 \ tailrecurse tradanch tweakfld \ @@ -3631,6 +3633,11 @@ 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 266e4a95..1759ee59 100644 --- a/test/Maketests +++ b/test/Maketests @@ -991,6 +991,11 @@ 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 new file mode 100644 index 00000000..6aa87d2e --- /dev/null +++ b/test/spacere.awk @@ -0,0 +1,22 @@ +BEGIN { + c[" "] = "\" \"" + c["\a"] = "\\a" + c["\b"] = "\\b" + c["\f"] = "\\f" + c["\n"] = "\\n" + c["\r"] = "\\r" + c["\t"] = "\\t" + c["\v"] = "\\v" + + sort = "LC_ALL=C sort" + + for (i in c) + printf("%s %s [[:space:]]\n", c[i], + i ~ /[[:space:]]/ ? "~" : "!~") | sort + + for (i in c) + printf("%s %s [[:blank:]]\n", c[i], + i ~ /[[:blank:]]/ ? "~" : "!~") | sort + + close(sort) +} diff --git a/test/spacere.ok b/test/spacere.ok new file mode 100644 index 00000000..4278c5c9 --- /dev/null +++ b/test/spacere.ok @@ -0,0 +1,16 @@ +" " ~ [[:blank:]] +" " ~ [[:space:]] +\a !~ [[:blank:]] +\a !~ [[:space:]] +\b !~ [[:blank:]] +\b !~ [[:space:]] +\f !~ [[:blank:]] +\f ~ [[:space:]] +\n !~ [[:blank:]] +\n ~ [[:space:]] +\r !~ [[:blank:]] +\r ~ [[:space:]] +\t ~ [[:blank:]] +\t ~ [[:space:]] +\v !~ [[:blank:]] +\v ~ [[:space:]] |