Date: Tue, 8 Oct 2013 08:57:59 +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: <20131008065759.GH16964@ithaqua.etoilebsd.net> In-Reply-To: <201310080653.r986rpUv018591@svn.freebsd.org> References: <201310080653.r986rpUv018591@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--smOfPzt+Qjm5bNGJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 > 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 > =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 > --- 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 > EXTRACT_ONLY+=3D ${JTREGFILE} > BUILD_DEPENDS+=3D ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-font= s/dejavu > -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 > @${RM} -f ${WRKDIR}/.Xvfb.pid 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. regards, Bapt --smOfPzt+Qjm5bNGJ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlJTrPcACgkQ8kTtMUmk6Ey83QCfUyeRCtMvKvYw7losvWqFxHJQ yH4An0jzGCcCFRajuZ+n1rrs4XIOjH6L =F1vN -----END PGP SIGNATURE----- --smOfPzt+Qjm5bNGJ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131008065759.GH16964>