2014-09-01 6:54 GMT+04:00 Stuart Cassoff <[email protected]>:
> On 08/29/14 02:39, Stuart Cassoff wrote:
>> Ever since that change, the var list in bsd.port.mk(5) is no longer in
>> alphabetical order.
>>
>>
>> Stu
>>
>
> The test targets as well.
I'll commit this tomorrow unless someone objects.
> Index: bsd.port.mk.5
> ===================================================================
> RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
> retrieving revision 1.404
> diff -u -p -r1.404 bsd.port.mk.5
> --- bsd.port.mk.5 10 Aug 2014 11:23:02 -0000 1.404
> +++ bsd.port.mk.5 1 Sep 2014 02:52:50 -0000
> @@ -673,26 +673,6 @@ and
> so that the packing-list is complete.
> .It Ar rebuild
> Force rebuild of the port.
> -.It Ar test
> -Run regression tests for the port.
> -Essentially depend on a correct build and invoke
> -.Bd -literal
> -env -i ${ALL_TEST_ENV} ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} \e
> - -f ${MAKE_FILE} ${TEST_TARGET} ${TEST_LOG}
> -.Ed
> -.Pp
> -If a port needs some other ports installed to run regression tests,
> -use
> -.Ev TEST_DEPENDS .
> -If a port needs special configuration or build options to enable regression
> -testing, define a
> -.Sq test
> -.Ev FLAVOR .
> -.It Ar test-depends
> -Verify packages needed for regression tests, using the same scheme as
> -.Ar build-depends .
> -Only invoked when regression tests are run, or explicitly through
> -.Ar depends .
> .It Ar reinstall
> Force reinstallation of a port, by first cleaning the old installation.
> Seldom needed, as
> @@ -758,6 +738,26 @@ Update an existing installation to a new
> like
> .Ar update ,
> but affects only one single subpackage in multi-packages ports.
> +.It Ar test
> +Run regression tests for the port.
> +Essentially depend on a correct build and invoke
> +.Bd -literal
> +env -i ${ALL_TEST_ENV} ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} \e
> + -f ${MAKE_FILE} ${TEST_TARGET} ${TEST_LOG}
> +.Ed
> +.Pp
> +If a port needs some other ports installed to run regression tests,
> +use
> +.Ev TEST_DEPENDS .
> +If a port needs special configuration or build options to enable regression
> +testing, define a
> +.Sq test
> +.Ev FLAVOR .
> +.It Ar test-depends
> +Verify packages needed for regression tests, using the same scheme as
> +.Ar build-depends .
> +Only invoked when regression tests are run, or explicitly through
> +.Ar depends .
> .It Ar unlink-categories
> Remove symbolic links in other directories that correspond to the port's
> .Ev CATEGORIES .
> @@ -2548,41 +2548,6 @@ checksum off
> .Pa ftp.openbsd.org ,
> in the directory
> .Pa /pub/OpenBSD/distfiles/$cipher/$value/$file .
> -.It Ev TEST_DEPENDS
> -See
> -.Ev BUILD_DEPENDS
> -for specification.
> -Test dependencies are only checked if the test stage is invoked.
> -.It Ev TEST_ENV
> -Additional environment variables passed to tests.
> -Empty by default.
> -.It Ev TEST_FLAGS
> -Extra flags passed to ${MAKE_PROGRAM} to run the regression tests.
> -Empty by default.
> -.It Ev TEST_IS_INTERACTIVE
> -Set to
> -.Sq Yes
> -if port needs human interaction to run its tests, or set to
> -.Sq X11
> -if the tests need an active X11 display to work.
> -.It Ev TEST_LOG
> -Command used to log the results of regression tests to TEST_LOGFILE.
> -.It Ev TEST_LOGFILE
> -Log file containing the results of regression tests.
> -.It Ev TEST_TARGET
> -Target to run regression tests.
> -Defaults to
> -.Sq regress ,
> -except for
> -.Sq perl
> -and
> -.Sq gnu
> -.Ev CONFIGURE_STYLE ,
> -which default to
> -.Sq test
> -and
> -.Sq check ,
> -respectively.
> .It Ev REORDER_DEPENDENCIES
> Points to a list of files that specify inter-dependencies for
> .Xr make 1 .
> @@ -2857,6 +2822,41 @@ target.
> User settings.
> Defaults to
> .Pa ${PORTSDIR}/infrastructure/templates .
> +.It Ev TEST_DEPENDS
> +See
> +.Ev BUILD_DEPENDS
> +for specification.
> +Test dependencies are only checked if the test stage is invoked.
> +.It Ev TEST_ENV
> +Additional environment variables passed to tests.
> +Empty by default.
> +.It Ev TEST_FLAGS
> +Extra flags passed to ${MAKE_PROGRAM} to run the regression tests.
> +Empty by default.
> +.It Ev TEST_IS_INTERACTIVE
> +Set to
> +.Sq Yes
> +if port needs human interaction to run its tests, or set to
> +.Sq X11
> +if the tests need an active X11 display to work.
> +.It Ev TEST_LOG
> +Command used to log the results of regression tests to TEST_LOGFILE.
> +.It Ev TEST_LOGFILE
> +Log file containing the results of regression tests.
> +.It Ev TEST_TARGET
> +Target to run regression tests.
> +Defaults to
> +.Sq regress ,
> +except for
> +.Sq perl
> +and
> +.Sq gnu
> +.Ev CONFIGURE_STYLE ,
> +which default to
> +.Sq test
> +and
> +.Sq check ,
> +respectively.
> .It Ev TRUEPREFIX
> Read-only.
> Mostly the same as ${PREFIX}, except it never gets ${DESTDIR} prepended
--
WBR,
Vadim Zhukov
