Date: Tue, 08 Oct 2013 14:08:46 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: Baptiste Daroussin <bapt@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: <52544A2E.9030703@FreeBSD.org> In-Reply-To: <20131008065759.GH16964@ithaqua.etoilebsd.net> References: <201310080653.r986rpUv018591@svn.freebsd.org> <20131008065759.GH16964@ithaqua.etoilebsd.net>
next in thread | previous in thread | raw e-mail | index | archive | help
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 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 >> 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. 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: .if defined(DISPLAY) _TEST_SEQ= do-test .else _TEST_SEQ= pre-test do-test post-test .ORDER: ${_TEST_SEQ} .endif test: ${_TEST_SEQ} ... do-test: build-depends build ... Jung-uk Kim -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQEcBAEBAgAGBQJSVEotAAoJEHyflib82/FGFnUH/00Bc+2GJqTnE7j2BtMw34JW jH0CPvpa6VcPqRzXMgHwOr2CCbMQ7CHXpDCQmFJhiMx3d5rMgsOtpFLChMwQmHth OdRnZMwAFkCu6VgWLcnEyV4ZvV4AfH+36KOxbOXO+Z/iC56GwV49Umeaq6jsTdBB 8+D3YOLb0VUehmnkPeHTSSmbXCOolcqQSqr6EC86HCk8dZwTlKgDzRzHJUlwZyTo uXMv/0RGmHq43nnNYPwAFdlyx4jWOqWcmDb60JK8rRlYU+lRFGZ2G/Lb1jjwsqa3 LKCMklITgaME6tugOjtrcxebBZaTnHKLmh0pHuY8GhIX6UkmLDSQQRC8OUHkkws= =WAo7 -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52544A2E.9030703>