* [PATCH 2/2] strip-trailing-cr is not needed in testsuite
@ 2017-05-08 16:43 Timo Myyrä
2017-05-08 19:59 ` Per Bothner
0 siblings, 1 reply; 2+ messages in thread
From: Timo Myyrä @ 2017-05-08 16:43 UTC (permalink / raw)
To: kawa
tests don't seem to require strip-trailing-cr flag and OpenBSD's diff doesn't have
that option so remove it.
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 071766c5d..199e2f151 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -8,7 +8,7 @@ KAWA = ../bin/kawa.sh
CPJAVA = CLASSPATH="..$(CLASSPATH_SEPARATOR)@conf_classpath@.$(CLASSPATH_SEPARATOR)$$CLASSPATH" $(JAVA)
CPKAWA = CLASSPATH="@conf_classpath@.$(CLASSPATH_SEPARATOR)$$CLASSPATH" $(KAWA)
KAWATEST = CLASSPATH=".$(CLASSPATH_SEPARATOR)$$CLASSPATH" $(KAWA) $(OPTIONS) -e '(load "testing.zip")'
-DIFF = diff --strip-trailing-cr
+DIFF = diff
if ENABLE_SERVLET
if ENABLE_XQUERY
--
2.12.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] strip-trailing-cr is not needed in testsuite
2017-05-08 16:43 [PATCH 2/2] strip-trailing-cr is not needed in testsuite Timo Myyrä
@ 2017-05-08 19:59 ` Per Bothner
0 siblings, 0 replies; 2+ messages in thread
From: Per Bothner @ 2017-05-08 19:59 UTC (permalink / raw)
To: Timo Myyrä, kawa
I checked in the fix below. Thanks!
On 05/07/2017 09:12 PM, Timo Myyrä wrote:
>
> tests don't seem to require strip-trailing-cr flag and OpenBSD's diff doesn't have
> that option so remove it.
>
> diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
> index 071766c5d..199e2f151 100644
> --- a/testsuite/Makefile.am
> +++ b/testsuite/Makefile.am
> @@ -8,7 +8,7 @@ KAWA = ../bin/kawa.sh
> CPJAVA = CLASSPATH="..$(CLASSPATH_SEPARATOR)@conf_classpath@.$(CLASSPATH_SEPARATOR)$$CLASSPATH" $(JAVA)
> CPKAWA = CLASSPATH="@conf_classpath@.$(CLASSPATH_SEPARATOR)$$CLASSPATH" $(KAWA)
> KAWATEST = CLASSPATH=".$(CLASSPATH_SEPARATOR)$$CLASSPATH" $(KAWA) $(OPTIONS) -e '(load "testing.zip")'
> -DIFF = diff --strip-trailing-cr
> +DIFF = diff
>
> if ENABLE_SERVLET
> if ENABLE_XQUERY
>
--
--Per Bothner
per@bothner.com http://per.bothner.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-08 19:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-08 16:43 [PATCH 2/2] strip-trailing-cr is not needed in testsuite Timo Myyrä
2017-05-08 19:59 ` Per Bothner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).