Source-Changes-HG archive

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

[src/trunk]: src/share/mk Fix the 'test' target to force atf to use its own f...



details:   https://anonhg.NetBSD.org/src/rev/d2899908cb12
branches:  trunk
changeset: 761748:d2899908cb12
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sun Feb 06 19:38:48 2011 +0000

description:
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.

diffstat:

 share/mk/bsd.test.mk |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r d96c2c8af335 -r d2899908cb12 share/mk/bsd.test.mk
--- a/share/mk/bsd.test.mk      Sun Feb 06 19:34:20 2011 +0000
+++ b/share/mk/bsd.test.mk      Sun Feb 06 19:38:48 2011 +0000
@@ -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}
 



Home | Main Index | Thread Index | Old Index