svn commit: r329761 - head/java/openjdk6

[Baptiste Daroussin]

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
> 
> Log:
>   Fix test option.
> 
> Modified:
>   head/java/openjdk6/Makefile
> 
> Modified: head/java/openjdk6/Makefile
> ==============================================================================
> --- 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+=	${FILESDIR}/alsa-disable
>  DISTFILES+=	${JTREGFILE}:jtreg
>  EXTRACT_ONLY+=	${JTREGFILE}
>  BUILD_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
> -USE_DISPLAY=	yes
> +USES+=		display
>  .else
>  EXTRA_PATCHES+=	${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=bsd ARCH=${ARCH:S/i386/i586/} ${GMAKE} tests)
>  .if !defined(DISPLAY)
>  	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
>  	@${RM} -f ${WRKDIR}/.Xvfb.pid

USES=	display actually does the running and killing of Xvfb, in the case you
probably want USES=	display:test and remove the start and kill of xvfb.

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20131008/b62ad2bc/attachment.sig>