From efefbfe40342975cc0ddbd69a9b0f2635d905d3c Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Tue, 24 Feb 2015 22:08:45 +0200 Subject: Fix line continuation with CR-LF. --- test/ChangeLog | 5 +++++ test/Makefile.am | 4 +++- test/Makefile.in | 9 ++++++++- test/Maketests | 5 +++++ test/crlf.awk | 11 +++++++++++ test/crlf.ok | 3 +++ 6 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 test/crlf.awk create mode 100644 test/crlf.ok (limited to 'test') diff --git a/test/ChangeLog b/test/ChangeLog index 0d6934e9..84e416b3 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-02-24 Arnold D. Robbins + + * Makefile.am (crlf): New test. + * crlf.awk, crlf.ok: New files. + 2015-02-10 Arnold D. Robbins * Makefile.am (profile0): New test. diff --git a/test/Makefile.am b/test/Makefile.am index 419265f9..499c004a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -169,6 +169,8 @@ EXTRA_DIST = \ concat4.ok \ convfmt.awk \ convfmt.ok \ + crlf.awk \ + crlf.ok \ datanonl.awk \ datanonl.in \ datanonl.ok \ @@ -1030,7 +1032,7 @@ UNIX_TESTS = \ GAWK_EXT_TESTS = \ aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \ backw badargs beginfile1 beginfile2 binmode1 charasbytes \ - colonwarn clos1way dbugeval delsub devfd devfd1 devfd2 dumpvars exit \ + colonwarn clos1way crlf dbugeval delsub devfd devfd1 devfd2 dumpvars exit \ fieldwdth fpat1 fpat2 fpat3 fpatnull fsfwfs funlen \ functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops \ diff --git a/test/Makefile.in b/test/Makefile.in index 598285ed..cc1ab711 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -426,6 +426,8 @@ EXTRA_DIST = \ concat4.ok \ convfmt.awk \ convfmt.ok \ + crlf.awk \ + crlf.ok \ datanonl.awk \ datanonl.in \ datanonl.ok \ @@ -1286,7 +1288,7 @@ UNIX_TESTS = \ GAWK_EXT_TESTS = \ aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \ backw badargs beginfile1 beginfile2 binmode1 charasbytes \ - colonwarn clos1way dbugeval delsub devfd devfd1 devfd2 dumpvars exit \ + colonwarn clos1way crlf dbugeval delsub devfd devfd1 devfd2 dumpvars exit \ fieldwdth fpat1 fpat2 fpat3 fpatnull fsfwfs funlen \ functab1 functab2 functab3 fwtest fwtest2 fwtest3 \ genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops \ @@ -3429,6 +3431,11 @@ backw: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +crlf: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + delsub: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/Maketests b/test/Maketests index f3639b0f..adf95cc5 100644 --- a/test/Maketests +++ b/test/Maketests @@ -962,6 +962,11 @@ backw: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ +crlf: + @echo $@ + @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + delsub: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/crlf.awk b/test/crlf.awk new file mode 100644 index 00000000..79be9eb6 --- /dev/null +++ b/test/crlf.awk @@ -0,0 +1,11 @@ +BEGIN { + print \ + "hi there" + print "hello \ +world" + if ("foo" ~ /fo\ +o/) + print "matches" + else + print "does not match!" +} diff --git a/test/crlf.ok b/test/crlf.ok new file mode 100644 index 00000000..0ba071b5 --- /dev/null +++ b/test/crlf.ok @@ -0,0 +1,3 @@ +hi there +hello world +matches -- cgit v1.2.3 From f2e925905fe241c1723a6597a923dc5f3ebe56bf Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Thu, 26 Feb 2015 20:20:01 +0200 Subject: Fixes for building a tarball. --- test/ChangeLog | 5 +++++ test/Makefile.am | 1 + test/Makefile.in | 1 + 3 files changed, 7 insertions(+) (limited to 'test') diff --git a/test/ChangeLog b/test/ChangeLog index 84e416b3..6fa24a49 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2015-02-26 Arnold D. Robbins + + * Makefile.am (EXTRA_DIST): Add profile0.in which got forgotten + earlier. Ooops. + 2015-02-24 Arnold D. Robbins * Makefile.am (crlf): New test. diff --git a/test/Makefile.am b/test/Makefile.am index 499c004a..71cfa513 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -713,6 +713,7 @@ EXTRA_DIST = \ procinfs.awk \ procinfs.ok \ profile0.awk \ + profile0.in \ profile0.ok \ profile2.ok \ profile3.awk \ diff --git a/test/Makefile.in b/test/Makefile.in index cc1ab711..7ac2ad7d 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -970,6 +970,7 @@ EXTRA_DIST = \ procinfs.awk \ procinfs.ok \ profile0.awk \ + profile0.in \ profile0.ok \ profile2.ok \ profile3.awk \ -- cgit v1.2.3