From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3105 invoked by alias); 8 May 2017 16:43:50 -0000 Mailing-List: contact kawa-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: kawa-owner@sourceware.org Received: (qmail 3087 invoked by uid 89); 8 May 2017 16:43:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-22.9 required=5.0 tests=AWL,BAYES_00,DATE_IN_PAST_12_24,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_LOW,UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 spammy=H*r:sk:mail.wi, Hx-spam-relays-external:sk:mail.wi, H*RU:sk:mail.wi X-HELO: gw01.mail.saunalahti.fi Received: from gw01.mail.saunalahti.fi (HELO gw01.mail.saunalahti.fi) (195.197.172.115) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 08 May 2017 16:43:48 +0000 Received: from deimos.wickedbsd.net (a91-153-249-219.elisa-laajakaista.fi [91.153.249.219]) by gw01.mail.saunalahti.fi (Postfix) with ESMTP id 45C004010D for ; Mon, 8 May 2017 19:43:45 +0300 (EEST) Received: from phobos.TeleWell.gateway.wickedbsd.net (10.0.0.6 [10.0.0.6]) by mail.wickedbsd.net (OpenSMTPD) with ESMTPSA id c0c669c0 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Mon, 8 May 2017 19:43:45 +0300 (EEST) From: timo.myyra@wickedbsd.net (Timo =?utf-8?Q?Myyr=C3=A4?=) To: kawa@sourceware.org Subject: [PATCH 2/2] strip-trailing-cr is not needed in testsuite Date: Mon, 08 May 2017 16:43:00 -0000 Message-ID: <87zienjo45.fsf@phobos.TeleWell.gateway> MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2017-q2/txt/msg00052.txt.bz2 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