Module Name:    src
Committed By:   jmmv
Date:           Sun Feb  6 19:38:48 UTC 2011

Modified Files:
        src/share/mk: bsd.test.mk

Log Message:
Fix the 'test' target to force atf to use its own files from DESTDIR instead
of the installed ones.  This is achieved by overriding all ATF_* environment
variables and making them point inside DESTDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/share/mk/bsd.test.mk

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

Modified files:

Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.13 src/share/mk/bsd.test.mk:1.14
--- src/share/mk/bsd.test.mk:1.13	Mon Aug 23 16:03:03 2010
+++ src/share/mk/bsd.test.mk	Sun Feb  6 19:38:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.13 2010/08/23 16:03:03 joerg Exp $
+# $NetBSD: bsd.test.mk,v 1.14 2011/02/06 19:38:48 jmmv Exp $
 #
 
 .include <bsd.init.mk>
@@ -99,6 +99,15 @@
 TESTS_PATH += ${DESTDIR}/bin ${DESTDIR}/sbin ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin
 TESTS_LD_LIBRARY_PATH += ${DESTDIR}/lib ${DESTDIR}/usr/lib
 
+TESTS_ENV += ATF_BUILD_CC=${DESTDIR}/usr/bin/cc
+TESTS_ENV += ATF_BUILD_CPP=${DESTDIR}/usr/bin/cpp
+TESTS_ENV += ATF_BUILD_CXX=${DESTDIR}/usr/bin/c++
+TESTS_ENV += ATF_CONFDIR=${DESTDIR}/etc
+TESTS_ENV += ATF_INCLUDEDIR=${DESTDIR}/usr/include
+TESTS_ENV += ATF_LIBDIR=${DESTDIR}/usr/lib
+TESTS_ENV += ATF_LIBEXECDIR=${DESTDIR}/usr/libexec
+TESTS_ENV += ATF_PKGDATADIR=${DESTDIR}/usr/share/atf
+TESTS_ENV += ATF_SHELL=${DESTDIR}/bin/sh
 TESTS_ENV += LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:S/ /:/g}
 TESTS_ENV += PATH=${TESTS_PATH:tW:S/ /:/g}
 

Reply via email to