Date: Tue, 8 Oct 2013 20:30:32 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Jung-uk Kim <jkim@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r329761 - head/java/openjdk6 Message-ID: <20131008183031.GA74296@ithaqua.etoilebsd.net> In-Reply-To: <52544A2E.9030703@FreeBSD.org> References: <201310080653.r986rpUv018591@svn.freebsd.org> <20131008065759.GH16964@ithaqua.etoilebsd.net> <52544A2E.9030703@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131008183031.GA74296>