From owner-svn-ports-head@FreeBSD.ORG Tue Oct 8 18:30:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 53585299; Tue, 8 Oct 2013 18:30:38 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wg0-x22f.google.com (mail-wg0-x22f.google.com [IPv6:2a00:1450:400c:c00::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2AFE126F9; Tue, 8 Oct 2013 18:30:37 +0000 (UTC) Received: by mail-wg0-f47.google.com with SMTP id f12so9137716wgh.26 for ; Tue, 08 Oct 2013 11:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=EajgZ6znPe2bLWAjittMZV2NeGVWIuSi5uMgOpiIf4M=; b=oAcBXCNBNg34zYIltpxWafBAmBOziowv3AazZLFyp0242o3K2AoMb1xujo6NiRgF9z DCamnGYDAtWD/hInlcg/mSrYYVJSTccS22AQzm+1upCUiYhq95Pi+rH4jSzOoZ6pIiJz SUGhv7O0A+sgAy2YcsxcQg+IOOtTV0JQTlrKHDRwXuN1jMdUIh4TbjzjjLhgd6ARz/6f Kb8tyR66Mty4UFJY6/urfynyyiaT1JX5nlP6WC1yZiyY4OGsJiOUxuE6QeZQp3rnXPjW uNwFlk5UlK4KGleTVI4Jk3Olp77ZWlZXbRHhutwVdtMS+1QCbvIgWTw/0PNQCZj+qPbp PDbw== X-Received: by 10.180.105.36 with SMTP id gj4mr2965297wib.14.1381257035474; Tue, 08 Oct 2013 11:30:35 -0700 (PDT) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id q5sm7690119wiz.3.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 08 Oct 2013 11:30:34 -0700 (PDT) Sender: Baptiste Daroussin Date: Tue, 8 Oct 2013 20:30:32 +0200 From: Baptiste Daroussin To: Jung-uk Kim Subject: Re: svn commit: r329761 - head/java/openjdk6 Message-ID: <20131008183031.GA74296@ithaqua.etoilebsd.net> References: <201310080653.r986rpUv018591@svn.freebsd.org> <20131008065759.GH16964@ithaqua.etoilebsd.net> <52544A2E.9030703@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="G4iJoqBmSsgzjUCe" Content-Disposition: inline In-Reply-To: <52544A2E.9030703@FreeBSD.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 18:30:38 -0000 --G4iJoqBmSsgzjUCe Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 08, 2013 at 02:08:46PM -0400, Jung-uk Kim wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 >=20 > On 2013-10-08 02:57:59 -0400, Baptiste Daroussin wrote: > > On Tue, Oct 08, 2013 at 06:53:51AM +0000, Jung-uk Kim wrote: > >> Author: jkim Date: Tue Oct 8 06:53:50 2013 New Revision: 329761=20 > >> URL: http://svnweb.freebsd.org/changeset/ports/329761 > >>=20 > >> Log: Fix test option. > >>=20 > >> Modified: head/java/openjdk6/Makefile > >>=20 > >> Modified: head/java/openjdk6/Makefile=20 > >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > >> > >>=20 > - --- head/java/openjdk6/Makefile Tue Oct 8 06:28:41 2013 (r329760) > >> +++ head/java/openjdk6/Makefile Tue Oct 8 06:53:50 2013 > >> (r329761) @@ -174,7 +174,7 @@ EXTRA_PATCHES+=3D > >> ${FILESDIR}/alsa-disable DISTFILES+=3D ${JTREGFILE}:jtreg=20 > >> EXTRACT_ONLY+=3D ${JTREGFILE} BUILD_DEPENDS+=3D > >> ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu=20 > >> -USE_DISPLAY=3D yes +USES+=3D display .else EXTRA_PATCHES+=3D > >> ${FILESDIR}/test_gamma-disable.patch .endif @@ -277,7 +277,8 @@ > >> test: build-depends build -fp ${LOCALBASE}/lib/X11/fonts/misc > > >> /dev/null 2>&1 & \ ${ECHO_CMD} $$! > ${WRKDIR}/.Xvfb.pid .endif - > >> @-(cd ${WRKSRC}/jdk/test; ${SETENV} ${MAKE_ENV} ${GMAKE} tests) + > >> @-(cd ${WRKSRC}/jdk/test; ${SETENV} ${MAKE_ENV} \ + > >> PLATFORM=3Dbsd ARCH=3D${ARCH:S/i386/i586/} ${GMAKE} tests) .if > >> !defined(DISPLAY) @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill=20 > >> @${RM} -f ${WRKDIR}/.Xvfb.pid > >=20 > > USES=3D display actually does the running and killing of Xvfb, in the > > case you probably want USES=3D display:test and remove the start and > > kill of xvfb. >=20 > Unfortunately, "test" is not a canonical target, i.e., it is not > defined by bsd.port.mk. I can only define them locally, e.g., > something like this: >=20 > .if defined(DISPLAY) > _TEST_SEQ=3D do-test > .else > _TEST_SEQ=3D pre-test do-test post-test > .ORDER: ${_TEST_SEQ} > .endif > test: ${_TEST_SEQ} > ... > do-test: build-depends build > ... >=20 I agree that is not very convenient... regards, Bapt --G4iJoqBmSsgzjUCe Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlJUT0cACgkQ8kTtMUmk6Ey38gCeLQQC/NjJxffXqxOiHfxYjr5B CH8An1KbIoVQOJga9LJ/FL6KXTwfYsCK =6twn -----END PGP SIGNATURE----- --G4iJoqBmSsgzjUCe--