[PATCH 2/2] strip-trailing-cr is not needed in testsuite

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] strip-trailing-cr is not needed in testsuite

Timo Myyrä

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

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/2] strip-trailing-cr is not needed in testsuite

Per Bothner
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
[hidden email]   http://per.bothner.com/