svn commit: r401117 - head/Mk

[Bryan Drewery]

On 11/9/2015 9:32 AM, Dmitry Marakasov wrote:
> Author: amdmi3
> Date: Mon Nov  9 17:32:06 2015
> New Revision: 401117
> URL: https://svnweb.freebsd.org/changeset/ports/401117
> 
> Log:
>   Don't use cookie for test target
>   
>   Test target doesn't produce anything and nothing depends on it.
>   Also it's often useful to run tests multiple times in a row, so
>   having a cookie which remembers that the tests were already ran
>   and inhibits subsequent test runs is needless. It also eliminates
>   the need for retest target.
>   
>   Approved by:	portmgr (mat)
>   Differential Revision:	D3875
> 

I think a 'retest' is more appropriate. Tests can be expensive and this
could lead to something like Poudriere calling the test target twice due
to things like stage-qa depending on in it in the future.

Why would you run the tests again without rerunning any of the other
targets too (such as rebuilding/restaging/reinstalling)? This cookie
should depend on previous stages it depends on.

> Modified:
>   head/Mk/bsd.port.mk
> 
> Modified: head/Mk/bsd.port.mk
> ==============================================================================
> --- head/Mk/bsd.port.mk	Mon Nov  9 17:14:12 2015	(r401116)
> +++ head/Mk/bsd.port.mk	Mon Nov  9 17:32:06 2015	(r401117)
> @@ -1987,7 +1987,6 @@ REINPLACE_CMD?=	${SED} ${REINPLACE_ARGS}
>  EXTRACT_COOKIE?=	${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX:S/\//_/g}
>  CONFIGURE_COOKIE?=	${WRKDIR}/.configure_done.${PORTNAME}.${PREFIX:S/\//_/g}
>  INSTALL_COOKIE?=	${WRKDIR}/.install_done.${PORTNAME}.${PREFIX:S/\//_/g}
> -TEST_COOKIE?=		${WRKDIR}/.test_done.${PORTNAME}.${PREFIX:S/\//_/g}
>  BUILD_COOKIE?=		${WRKDIR}/.build_done.${PORTNAME}.${PREFIX:S/\//_/g}
>  PATCH_COOKIE?=		${WRKDIR}/.patch_done.${PORTNAME}.${PREFIX:S/\//_/g}
>  PACKAGE_COOKIE?=	${WRKDIR}/.package_done.${PORTNAME}.${PREFIX:S/\//_/g}
> @@ -2981,7 +2980,7 @@ build: configure
>  # Disable test
>  .if defined(NO_TEST) && !target(test)
>  test: stage
> -	@${TOUCH} ${TOUCH_FLAGS} ${TEST_COOKIE}
> +	@${DO_NADA}
>  .endif
>  
>  # Disable package
> @@ -5788,7 +5787,7 @@ _${_t}_REAL_SUSEQ+=	${s}
>  # See above *_SEQ and *_DEP. The _DEP will run before this defined target is
>  # ran. The _SEQ will run as this target once _DEP is satisfied.
>  
> -.for target in extract patch configure build stage install test package
> +.for target in extract patch configure build stage install package
>  
>  # Check if config dialog needs to show and execute it if needed. If is it not
>  # needed (_OPTIONS_OK), then just depend on the cookie which is defined later
> @@ -5857,6 +5856,10 @@ fetch: ${_FETCH_DEP} ${_FETCH_REAL_SEQ}
>  pkg: ${_PKG_DEP} ${_PKG_REAL_SEQ}
>  .endif
>  
> +.if !target(test)
> +test: ${_TEST_DEP} ${_TEST_REAL_SEQ}
> +.endif
> +
>  .endif
>  # End of post-makefile section.
>  
> 


-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20151109/781df95a/attachment.bin>