Date: Mon, 9 Nov 2015 09:50:27 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Dmitry Marakasov <amdmi3@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r401117 - head/Mk Message-ID: <5640DCE3.2090007@FreeBSD.org> In-Reply-To: <201511091732.tA9HW67l073922@repo.freebsd.org> References: <201511091732.tA9HW67l073922@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --rO05g4pNmh8ot2D4pDrnt4porV5L9BT9g Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Don't use cookie for test target > =20 > 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. > =20 > Approved by: portmgr (mat) > Differential Revision: D3875 >=20 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 >=20 > Modified: head/Mk/bsd.port.mk > =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/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?=3D ${SED} ${REINPLACE_ARGS} > EXTRACT_COOKIE?=3D ${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX:S/\//_= /g} > CONFIGURE_COOKIE?=3D ${WRKDIR}/.configure_done.${PORTNAME}.${PREFIX:S/= \//_/g} > INSTALL_COOKIE?=3D ${WRKDIR}/.install_done.${PORTNAME}.${PREFIX:S/\//_= /g} > -TEST_COOKIE?=3D ${WRKDIR}/.test_done.${PORTNAME}.${PREFIX:S/\//_/g} > BUILD_COOKIE?=3D ${WRKDIR}/.build_done.${PORTNAME}.${PREFIX:S/\//_/g}= > PATCH_COOKIE?=3D ${WRKDIR}/.patch_done.${PORTNAME}.${PREFIX:S/\//_/g}= > PACKAGE_COOKIE?=3D ${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 > =20 > # Disable package > @@ -5788,7 +5787,7 @@ _${_t}_REAL_SUSEQ+=3D ${s} > # See above *_SEQ and *_DEP. The _DEP will run before this defined tar= get is > # ran. The _SEQ will run as this target once _DEP is satisfied. > =20 > -.for target in extract patch configure build stage install test packag= e > +.for target in extract patch configure build stage install package > =20 > # 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 define= d later > @@ -5857,6 +5856,10 @@ fetch: ${_FETCH_DEP} ${_FETCH_REAL_SEQ} > pkg: ${_PKG_DEP} ${_PKG_REAL_SEQ} > .endif > =20 > +.if !target(test) > +test: ${_TEST_DEP} ${_TEST_REAL_SEQ} > +.endif > + > .endif > # End of post-makefile section. > =20 >=20 --=20 Regards, Bryan Drewery --rO05g4pNmh8ot2D4pDrnt4porV5L9BT9g Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJWQNzjAAoJEDXXcbtuRpfPlrQH/3WxULE4epWX3XIRQ9DILR4Q PY6uUQsaefR6MQxouZ2v9XWMr9TCuUm1TufuYpf0tQX/sVyzEfloIftXaR0gTyjE TEUuKS1UBAm9DWnKTdKVvMWLS7BhHixyHqIcO/RbubVay8Q58UH3IYITa1Eg9e5P CdLJgsojm8ZNXfqfaDpEzxeuShG7bQuJHuSJcoa7Kc5CTsS9ggRV4DrwxOAqym/e KwSalXHow52+JIAahpWZHp506UCbcxCgYBfmsx++ZG4u+J/YhVQUhpieVUgBTwro SO2FbtZGXlhh2k20tvJQyNFdoCt2cMfF0wJAvXU0GiXh+l5xIhZ1R+urrUdPjOs= =tCNa -----END PGP SIGNATURE----- --rO05g4pNmh8ot2D4pDrnt4porV5L9BT9g--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5640DCE3.2090007>