pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Create TEST_ENV variable that's initially just MAKE...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f8ee7d1a2fdb
branches:  trunk
changeset: 461052:f8ee7d1a2fdb
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Sep 10 02:20:50 2003 +0000

description:
Create TEST_ENV variable that's initially just MAKE_ENV, but can be added
to by a package Makefile.  This is passed as the environment when running
the test target.  We often need this since packages can require setting
up LD_LIBRARY_PATH so that we can test before installation.

diffstat:

 mk/bsd.pkg.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 147b522c3155 -r f8ee7d1a2fdb mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Sep 10 02:16:42 2003 +0000
+++ b/mk/bsd.pkg.mk     Wed Sep 10 02:20:50 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1267 2003/09/09 13:36:36 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1268 2003/09/10 02:20:50 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -2361,13 +2361,14 @@
 #Test
 
 TEST_DIRS?=    ${BUILD_DIRS}
+TEST_ENV+=     ${MAKE_ENV}
 
 .PHONY: do-test
 .if !target(do-test)
 do-test:
 .  if defined(TEST_TARGET)
 .    for DIR in ${TEST_DIRS}
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${TEST_TARGET}
+       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} ${TEST_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${TEST_TARGET}
 .    endfor
 .  else
        @${DO_NADA}



Home | Main Index | Thread Index | Old Index