Date: Tue, 29 Sep 2015 08:42:08 +0100 From: David Chisnall <theraven@FreeBSD.org> To: Dmitry Marakasov <amdmi3@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r398125 - in head: . Mk Mk/Scripts Mk/Uses astro/osmium devel/pire devel/sdl2pp games/spring graphics/glosm Message-ID: <886F9C38-4062-484B-B809-40027780B17B@FreeBSD.org> In-Reply-To: <201509281720.t8SHKhGQ088408@repo.freebsd.org> References: <201509281720.t8SHKhGQ088408@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
What format (and where) does the test target expect to find the output? David > On 28 Sep 2015, at 18:20, Dmitry Marakasov <amdmi3@FreeBSD.org> wrote: >=20 > Author: amdmi3 > Date: Mon Sep 28 17:20:42 2015 > New Revision: 398125 > URL: https://svnweb.freebsd.org/changeset/ports/398125 >=20 > Log: > Implemented complete support for test target. >=20 > You can now `make test' on any port to run test sequence, no-op by = default. > If a port defines TEST_TARGET, it'll run sub-make with specified = target, > usually `check' or `test', useful if upstream supports that. The port = may > instead define custom do-test target, as well as usual satellite = targets: >=20 > {pre,do,post}-test, {pre,do,post}-test-OPT, = {pre,do,post}-test-OPT-off >=20 > `make test' builds and stages port first, so test may use both WRKDIR = and > STAGEDIR, and both BUILD and RUN depends are available for test = target. > Additionally, TEST_DEPENDS is now properly supported and may be used = to > define additional depends specifically for testing. >=20 > Framework may define default tests for specific cases. For instance, > perl5.mk and cran.mk already provide default test target on their = own. >=20 > This commit also converts my ports which have tests to this new = framework. >=20 > Approved by: portmgr (bapt) > Differential Revision: D3680 >=20 > Added: > head/Mk/Scripts/depends-list.sh > - copied, changed from r397035, = head/Mk/Scripts/all-depends-list.sh > Modified: > head/CHANGES > head/Mk/Uses/cran.mk > head/Mk/Uses/perl5.mk > head/Mk/bsd.options.mk > head/Mk/bsd.port.mk > head/astro/osmium/Makefile > head/devel/pire/Makefile > head/devel/sdl2pp/Makefile > head/games/spring/Makefile > head/graphics/glosm/Makefile >=20 > Modified: head/CHANGES > = =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/CHANGES Mon Sep 28 17:09:32 2015 (r398124) > +++ head/CHANGES Mon Sep 28 17:20:42 2015 (r398125) > @@ -10,6 +10,26 @@ in the release notes and/or placed into=20 >=20 > All ports committers are allowed to commit to this file. >=20 > +20150928: > +AUTHOR: amdmi3@FreeBSD.org > + > + Implemented complete support for test target. > + > + You can now `make test' on any port to run test sequence, no-op by = default. > + If a port defines TEST_TARGET, it'll run sub-make with specified = target, > + usually `check' or `test' if upstream supports that. The port may = also > + define custom do-test target, as well as usual satellite targets: > + > + {pre,do,post}-test, {pre,do,post}-test-OPT, = {pre,do,post}-test-OPT-off > + > + `make test' builds and stages port first, so test may use both = WRKDIR and > + STAGEDIR, and both BUILD and RUN depends are available for test = target. > + Additionally, TEST_DEPENDS is now properly supported and may be = used to > + define additional depends specifically for testing. > + > + Framework may define default tests for specific cases. For = instance, > + perl5.mk and cran.mk provide default test target on their own. > + > 20150926: > AUTHOR: bapt@FreeBSD.org >=20 >=20 > Copied and modified: head/Mk/Scripts/depends-list.sh (from r397035, = head/Mk/Scripts/all-depends-list.sh) > = =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/Scripts/all-depends-list.sh Wed Sep 16 00:58:12 2015 = (r397035, copy source) > +++ head/Mk/Scripts/depends-list.sh Mon Sep 28 17:20:42 2015 = (r398125) > @@ -6,7 +6,7 @@ set -e >=20 > . ${dp_SCRIPTSDIR}/functions.sh >=20 > -validate_env dp_ALLDEPENDS dp_PORTSDIR dp_PKGNAME dp_MAKE > +validate_env dp_ALLDEPENDS dp_PORTSDIR dp_PKGNAME >=20 > set -u >=20 > @@ -31,7 +31,6 @@ check_dep() { > continue > fi > echo ${d} > - check_dep $(${dp_MAKE} -C ${d} -V_UNIFIED_DEPENDS) > done > } >=20 >=20 > Modified: head/Mk/Uses/cran.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/Uses/cran.mk Mon Sep 28 17:09:32 2015 = (r398124) > +++ head/Mk/Uses/cran.mk Mon Sep 28 17:20:42 2015 = (r398125) > @@ -41,14 +41,14 @@ WRKSRC?=3D ${WRKDIR}/${PORTNAME} > NO_BUILD=3D yes > R_COMMAND=3D ${LOCALBASE}/bin/R >=20 > -.if !target(regression-test) > +.if !target(do-test) > R_POSTCMD_CHECK_OPTIONS?=3D --timings >=20 > .if !exists(${LOCALBASE}/bin/pdflatex) > R_POSTCMD_CHECK_OPTIONS+=3D --no-manual --no-rebuild-vignettes > .endif >=20 > -regression-test: build > +do-test: > @cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} = _R_CHECK_FORCE_SUGGESTS_=3DFALSE \ > ${R_COMMAND} ${R_PRECMD_CHECK_OPTIONS} CMD check \ > ${R_POSTCMD_CHECK_OPTIONS} ${PORTNAME} >=20 > Modified: head/Mk/Uses/perl5.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/Uses/perl5.mk Mon Sep 28 17:09:32 2015 = (r398124) > +++ head/Mk/Uses/perl5.mk Mon Sep 28 17:20:42 2015 = (r398125) > @@ -308,19 +308,14 @@ fix-perl-things: > @${RM} -f = ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* = || : > @${RMDIR} -p = ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} 2>/dev/null || : >=20 > -.if !target(regression-test) > -TEST_ARGS?=3D ${MAKE_ARGS} > -TEST_ENV?=3D ${MAKE_ENV} > +.if !target(do-test) > TEST_TARGET?=3D test > TEST_WRKSRC?=3D ${BUILD_WRKSRC} > -.if !target(test) > -test: regression-test > -.endif # test > -regression-test: build > +do-test: > .if ${USE_PERL5:Mmodbuild*} > - -cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${PERL5} = ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS} > + cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} = ${TEST_TARGET} ${TEST_ARGS} > .elif ${USE_PERL5:Mconfigure} > - -cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${MAKE_CMD} = ${TEST_ARGS} ${TEST_TARGET} > + cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${MAKE_CMD} = ${TEST_ARGS} ${TEST_TARGET} > .endif # USE_PERL5:Mmodbuild* > .endif # regression-test > .endif # defined(_POSTMKINCLUDED) >=20 > Modified: head/Mk/bsd.options.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.options.mk Mon Sep 28 17:09:32 2015 = (r398124) > +++ head/Mk/bsd.options.mk Mon Sep 28 17:20:42 2015 = (r398125) > @@ -162,6 +162,7 @@ _OPTIONS_TARGETS=3D fetch:300:pre fetch:50 > configure:300:pre configure:500:do = configure:700:post \ > build:300:pre build:500:do build:700:post \ > install:300:pre install:500:do install:700:post = \ > + test:300:pre test:500:do test:700:post \ > package:300:pre package:500:do package:700:post = \ > stage:800:post >=20 >=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 Sep 28 17:09:32 2015 = (r398124) > +++ head/Mk/bsd.port.mk Mon Sep 28 17:20:42 2015 = (r398125) > @@ -294,6 +294,17 @@ FreeBSD_MAINTAINER=3D portmgr@FreeBSD.org > # if a particular version is desired. > # LIB_DEPENDS - A list of "lib:dir[:target]" tuples of other ports = this > # package depends on. "lib" is the name = of a shared library. > +# TEST_DEPENDS - A list of "path:dir[:target]" tuples of other = ports this > +# package depends on in the "test" = stage. "path" is the > +# name of a file if it starts with a = slash (/), an > +# executable otherwise. make will test = for the existence > +# (if it is a full pathname) or search = for it in your > +# $PATH (if it is an executable) and go = into "dir" to do > +# a "make all install" if it's not = found. If the third > +# field ("target") exists, it will be = used instead of > +# ${DEPENDS_TARGET}. The first field = also supports a > +# package name with a version range, in = the form package>=3D1.2 > +# if a particular version is desired. > # DEPENDS_TARGET > # - The default target to execute when a = port is calling a > # dependency. > @@ -648,6 +659,9 @@ FreeBSD_MAINTAINER=3D portmgr@FreeBSD.org > # run-depends-list > # - Show all directories which are = run-dependencies > # for this port. > +# test-depends-list > +# - Show all directories which are = test-dependencies > +# for this port. > # > # extract - Unpacks ${DISTFILES} into ${WRKDIR}. > # patch - Apply any provided patches to the = source. > @@ -659,6 +673,7 @@ FreeBSD_MAINTAINER=3D portmgr@FreeBSD.org > # flag. > # deinstall - Remove the installation. > # deinstall-all - Remove all installations with the same = PKGORIGIN. > +# test - Run tests for the port. > # package - Create a package from an _installed_ port. > # package-recursive > # - Create a package for a port and _all_ = of its dependencies. > @@ -715,6 +730,7 @@ FreeBSD_MAINTAINER=3D portmgr@FreeBSD.org > # > # NO_BUILD - Use a dummy (do-nothing) build target. > # NO_INSTALL - Use a dummy (do-nothing) install target. > +# NO_TEST - Use a dummy (do-nothing) test target. > # > # Here are some variables used in various stages. > # > @@ -843,6 +859,18 @@ FreeBSD_MAINTAINER=3D portmgr@FreeBSD.org > # - Disable CCACHE support for example for = certain ports if > # CCACHE is enabled. User settable. > # > +# For test: > +# > +# TEST_TARGET - Target for sub-make in test stage. If not = defined, > +# no default test target is provided. > +# Default: (none) > +# TEST_WRKSRC - Directory to do test in (default: ${WRKSRC}). > +# TEST_ENV - Additional environment vars passed to sub-make = in test > +# stage > +# Default: ${MAKE_ENV} > +# TEST_ARGS - Any extra arguments to sub-make in test stage > +# Default: ${MAKE_ARGS} > +# > # For install: > # > # INSTALL_TARGET > @@ -1423,7 +1451,7 @@ UID!=3D ${ID} -u > DESTDIRNAME?=3D DESTDIR >=20 > # setup empty variables for USES targets > -.for target in sanity fetch extract patch configure build install = package stage > +.for target in sanity fetch extract patch configure build install = test package stage > _USES_${target}?=3D > .endfor >=20 > @@ -1478,6 +1506,9 @@ PKG_NOTES+=3D no_provide_shlib > PKG_NOTE_no_provide_shlib=3D yes > .endif >=20 > +TEST_ARGS?=3D ${MAKE_ARGS} > +TEST_ENV?=3D ${MAKE_ENV} > + > PKG_ENV+=3D PORTSDIR=3D${PORTSDIR} > CONFIGURE_ENV+=3D XDG_DATA_HOME=3D${WRKDIR} \ > XDG_CONFIG_HOME=3D${WRKDIR} \ > @@ -1547,6 +1578,7 @@ PATCH_WRKSRC?=3D ${WRKSRC} > CONFIGURE_WRKSRC?=3D ${WRKSRC} > BUILD_WRKSRC?=3D ${WRKSRC} > INSTALL_WRKSRC?=3D${WRKSRC} > +TEST_WRKSRC?=3D ${WRKSRC} >=20 > PLIST_SUB+=3D OSREL=3D${OSREL} PREFIX=3D%D LOCALBASE=3D${LOCALBASE} \ > RESETPREFIX=3D${PREFIX} > @@ -1933,6 +1965,7 @@ 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} > @@ -2793,7 +2826,7 @@ IGNORECMD=3D ${ECHO_MSG} "=3D=3D=3D> = ${PKGNAME} > .endif >=20 > _TARGETS=3D check-sanity fetch checksum extract patch configure all = build \ > - install reinstall package stage restage > + install reinstall test package stage restage >=20 > .for target in ${_TARGETS} > .if !target(${target}) > @@ -2919,6 +2952,12 @@ build: configure > @${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE} > .endif >=20 > +# Disable test > +.if defined(NO_TEST) && !target(test) > +test: stage > + @${TOUCH} ${TOUCH_FLAGS} ${TEST_COOKIE} > +.endif > + > # Disable package > .if defined(NO_PACKAGE) && !target(package) > package: > @@ -3454,6 +3493,23 @@ do-install: > @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} = ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) > .endif >=20 > +# Test > + > +.if !target(do-test) && defined(TEST_TARGET) > +DO_MAKE_TEST?=3D ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} = ${MAKEFILE} ${TEST_ARGS:C,^${DESTDIRNAME}=3D.*,,g} > +do-test: > + @(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \ > + if [ -n "${TEST_FAIL_MESSAGE}" ] ; then \ > + ${ECHO_MSG} "=3D=3D=3D> Tests failed = unexpectedly."; \ > + (${ECHO_CMD} "${TEST_FAIL_MESSAGE}") | ${FMT} 75 = 79 ; \ > + fi; \ > + ${FALSE}; \ > + fi) > +.elif !target(do-test) > +do-test: > + @${DO_NADA} > +.endif > + > # Package >=20 > .if !target(do-package) > @@ -3740,6 +3796,8 @@ stage-message: > @${ECHO_MSG} "=3D=3D=3D> Staging for ${PKGNAME}" > install-message: > @${ECHO_MSG} "=3D=3D=3D> Installing for ${PKGNAME}" > +test-message: > + @${ECHO_MSG} "=3D=3D=3D> Testing for ${PKGNAME}" > package-message: > @${ECHO_MSG} "=3D=3D=3D> Building package for ${PKGNAME}" >=20 > @@ -4260,7 +4318,7 @@ package-noinstall: package > .if !target(depends) > depends: pkg-depends extract-depends patch-depends lib-depends = fetch-depends build-depends run-depends >=20 > -.for deptype in PKG EXTRACT PATCH FETCH BUILD LIB RUN > +.for deptype in PKG EXTRACT PATCH FETCH BUILD LIB RUN TEST > ${deptype:tl}-depends: > .if defined(${deptype}_DEPENDS) && !defined(NO_DEPENDS) > @${SETENV} \ > @@ -4291,7 +4349,7 @@ ${deptype:tl}-depends: >=20 > # Dependency lists: both build and runtime, recursive. Print out = directory names. >=20 > -_UNIFIED_DEPENDS=3D${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} = ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS} > +_UNIFIED_DEPENDS=3D${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} = ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS} = ${TEST_DEPENDS} > _DEPEND_SPECIALS=3D = ${_UNIFIED_DEPENDS:M*\:*\:*:C,^[^:]*:([^:]*):.*$,\1,} >=20 > all-depends-list: > @@ -4458,6 +4516,18 @@ RUN-DEPENDS-LIST=3D \ > fi; \ > done | ${SORT} -u >=20 > +test-depends-list: > +.if defined(TEST_DEPENDS) > + @${TEST-DEPENDS-LIST} > +.endif > + > +TEST-DEPENDS-LIST=3D \ > + ${SETENV} dp_ALLDEPENDS=3D"${TEST_DEPENDS}" \ > + dp_PORTSDIR=3D"${PORTSDIR}" \ > + dp_PKGNAME=3D"${PKGNAME}" \ > + dp_SCRIPTSDIR=3D"${SCRIPTSDIR}" \ > + ${SH} ${SCRIPTSDIR}/depends-list.sh > + > # Package (recursive runtime) dependency list. Print out both = directory names > # and package names. >=20 > @@ -5556,7 +5626,7 @@ show-dev-errors: > # Please note that the order of the following targets is important, = and > # should not be modified. >=20 > -_TARGETS_STAGES=3D SANITY PKG FETCH EXTRACT PATCH CONFIGURE BUILD = INSTALL PACKAGE STAGE > +_TARGETS_STAGES=3D SANITY PKG FETCH EXTRACT PATCH CONFIGURE BUILD = INSTALL TEST PACKAGE STAGE >=20 > # Define the SEQ of actions to take when each target is ran, and which = targets > # it depends on before running its SEQ. > @@ -5620,6 +5690,10 @@ _STAGE_SEQ=3D 050:stage-message = 100:stage > .if defined(DEVELOPER) > _STAGE_SEQ+=3D 995:stage-qa > .endif > +_TEST_DEP=3D stage > +_TEST_SEQ=3D 100:test-message 150:test-depends 300:pre-test = 500:do-test \ > + 800:post-test \ > + ${_OPTIONS_test} ${_USES_test} > _INSTALL_DEP=3D stage > _INSTALL_SEQ=3D 100:install-message 150:run-depends = 151:lib-depends \ > 200:check-already-installed > @@ -5670,7 +5744,7 @@ _${_t}_REAL_SUSEQ+=3D ${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. >=20 > -.for target in extract patch configure build stage install package > +.for target in extract patch configure build stage install test = 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 = defined later >=20 > Modified: head/astro/osmium/Makefile > = =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/astro/osmium/Makefile Mon Sep 28 17:09:32 2015 = (r398124) > +++ head/astro/osmium/Makefile Mon Sep 28 17:20:42 2015 = (r398125) > @@ -46,9 +46,6 @@ do-build-DOXYGEN-on: > cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ > ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKR_ARGS} doc >=20 > -regression-test: > - cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${SH} run_tests.sh > - > do-install: > cd ${WRKSRC}/include && ${COPYTREE_SHARE} '${PORTNAME} = ${PORTNAME}.hpp' \ > ${STAGEDIR}${PREFIX}/include/ > @@ -58,4 +55,7 @@ do-install: > do-install-DOXYGEN-on: > cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html = ${STAGEDIR}${DOCSDIR}/ >=20 > +do-test: > + cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${SH} run_tests.sh > + > .include <bsd.port.mk> >=20 > Modified: head/devel/pire/Makefile > = =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/devel/pire/Makefile Mon Sep 28 17:09:32 2015 = (r398124) > +++ head/devel/pire/Makefile Mon Sep 28 17:20:42 2015 = (r398125) > @@ -20,22 +20,9 @@ GNU_CONFIGURE=3D yes > INSTALL_TARGET=3D install-strip > USES=3D autoreconf bison gmake libtool > USE_LDCONFIG=3D yes > +TEST_TARGET=3D check >=20 > ONLY_FOR_ARCHS=3D amd64 i386 ia64 > ONLY_FOR_ARCHS_REASON=3D not yet ported to big-endian platforms >=20 > -OPTIONS_DEFINE=3D UNITTEST > -UNITTEST_DESC=3D Compile with unittest support > - > -.include <bsd.port.options.mk> > - > -.if ${PORT_OPTIONS:MUNITTEST} || defined(PACKAGE_BUILDING) > -BUILD_DEPENDS+=3D cppunit-config:${PORTSDIR}/devel/cppunit > -CONFIGURE_ARGS+=3D--with-cppunit-prefix=3D${LOCALBASE} > - > -regression-test: build > - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} = ${MAKEFILE} ${MAKE_ARGS} check || \ > - (${CAT} ${WRKSRC}/tests/test-suite.log; false) > -.endif > - > .include <bsd.port.mk> >=20 > Modified: head/devel/sdl2pp/Makefile > = =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/devel/sdl2pp/Makefile Mon Sep 28 17:09:32 2015 = (r398124) > +++ head/devel/sdl2pp/Makefile Mon Sep 28 17:20:42 2015 = (r398125) > @@ -19,6 +19,7 @@ USES=3D compiler:c++11-lib cmake > CMAKE_ARGS=3D -DSDL2PP_ENABLE_LIVE_TESTS=3DOFF \ > -DSDL2PP_WITH_WERROR=3DON > USE_SDL=3D sdl2 image2 mixer2 ttf2 > +TEST_TARGET=3D test >=20 > PORTDOCS=3D * >=20 > @@ -40,7 +41,4 @@ post-install: > post-install-DOXYGEN-on: > cd ${CONFIGURE_WRKSRC} && ${COPYTREE_SHARE} doxygen = ${STAGEDIR}${DOCSDIR}/ >=20 > -regression-test: build > - cd ${WRKSRC} && ${DO_MAKE_BUILD} test > - > .include <bsd.port.post.mk> >=20 > Modified: head/games/spring/Makefile > = =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/games/spring/Makefile Mon Sep 28 17:09:32 2015 = (r398124) > +++ head/games/spring/Makefile Mon Sep 28 17:20:42 2015 = (r398125) > @@ -52,6 +52,9 @@ LEI_PREFIX=3D ${LOCALBASE} > # Do not exctract bundled copies of header files for 3rd-party = packages: > EXTRACT_AFTER_ARGS=3D--no-same-owner --no-same-permissions --exclude = ${WRKSRC:T}/include >=20 > +# The check-target fails right now: = https://springrts.com/mantis/view.php?id=3D4736 > +TEST_TARGET=3D check > + > PORTDOCS=3D * > PORTDATA=3D * >=20 > @@ -75,10 +78,6 @@ CXXFLAGS+=3D -Wno-deprecated # Too = much n >=20 > PR_DOWNLOADER_LIB_DEPENDS=3Dlibcurl.so:${PORTSDIR}/ftp/curl >=20 > -# The check-target fails right now: = https://springrts.com/mantis/view.php?id=3D4736 > -check test xregression-test: build > - ${MAKE} -C ${WRKSRC} check > - > .include <bsd.port.pre.mk> >=20 > .if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1000000 >=20 > Modified: head/graphics/glosm/Makefile > = =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/graphics/glosm/Makefile Mon Sep 28 17:09:32 2015 = (r398124) > +++ head/graphics/glosm/Makefile Mon Sep 28 17:20:42 2015 = (r398125) > @@ -18,15 +18,13 @@ USE_GL=3D gl > USE_SDL=3D sdl > USE_GITHUB=3D yes > GH_ACCOUNT=3D AMDmi3 > +TEST_TARGET=3D test >=20 > PORTDOCS=3D README ChangeLog >=20 > OPTIONS_DEFINE=3D DOCS >=20 > -regression-test: > - cd ${BUILD_WRKSRC} && ctest > - > -post-install: > +post-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} > .for f in ${PORTDOCS} > ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?886F9C38-4062-484B-B809-40027780B17B>