diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-11-09 17:32:06 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-11-09 17:32:06 +0000 |
| commit | 270e3dbc28c3901b29d4cd559929c79dd03668c1 (patch) | |
| tree | 361d18c42b9af84fb0a644a7795a70937823b8f4 /Mk | |
| parent | Update to 3.1.9-22-ga91b224. (diff) | |
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
Notes
Notes:
svn path=/head/; revision=401117
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 664ff8001875..c27f12bec82e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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. |