CVS commit: pkgsrc/mk/build

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Oct 13 11:08:10 UTC 2019

Modified Files:
        pkgsrc/mk/build: test.mk

Log Message:
mk/build/test.mk: reorder the _VARGROUPS variables

The tests are only run if TEST_TARGET is defined. Therefore it should be
listed first.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mk/build/test.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/build/test.mk
diff -u pkgsrc/mk/build/test.mk:1.22 pkgsrc/mk/build/test.mk:1.23
--- pkgsrc/mk/build/test.mk:1.22        Sun Oct 13 10:34:37 2019
+++ pkgsrc/mk/build/test.mk     Sun Oct 13 11:08:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.22 2019/10/13 10:34:37 rillig Exp $
+# $NetBSD: test.mk,v 1.23 2019/10/13 11:08:10 rillig Exp $
 #
 # After the "build" phase, many packages provide some sort of self-test
 # that can be run on the not-yet installed package. To enable these
@@ -40,7 +40,10 @@
 
 _VARGROUPS+=           test
 _USER_VARS.test=       PKGSRC_RUN_TEST
-_PKG_VARS.test=                TEST_DIRS TEST_ENV TEST_MAKE_FLAGS MAKE_FILE TEST_TARGET
+_PKG_VARS.test=                TEST_TARGET TEST_DIRS TEST_ENV TEST_MAKE_FLAGS
+_USE_VARS.test=                BUILD_DIRS MAKE_ENV MAKE_FLAGS MAKEFLAGS MAKE_FILE \
+                       RECURSIVE_MAKE INTERACTIVE_STAGE BATCH WRKSRC
+_IGN_VARS.test=                _* PKGNAME .CURDIR
 _SORTED_VARS.test=     *_ENV
 _LISTED_VARS.test=     *_DIRS *_FLAGS
 
@@ -124,7 +127,7 @@ test-message:
 ### test-check-interactive checks whether we must do an interactive
 ### test or not.
 ###
-test-check-interactive:
+test-check-interactive: .PHONY
 .if !empty(INTERACTIVE_STAGE:Mtest) && defined(BATCH)
        @${ERROR_MSG} "The test stage of this package requires user interaction"
        @${ERROR_MSG} "Please test manually with:"