Date: Wed, 24 Apr 2013 09:32:07 -0700 From: Garrett Cooper <yaneurabeya@gmail.com> To: Brooks Davis <brooks@freebsd.org> Cc: arch@freebsd.org, "Simon J. Gerraty" <sjg@juniper.net>, benno@freebsd.org, toolchain@freebsd.org Subject: Re: [RFC] [Optionally] build tests with buildworld Message-ID: <C1CCA2E3-C191-4097-895D-CD39F40C8C02@gmail.com> In-Reply-To: <20130424162307.GA16731@lor.one-eyed-alien.net> References: <CAGHfRMCTRM4sFS09jLp3DegJ5U0xujHmaw0YuAW1JTOuTqHGaw@mail.gmail.com> <20130423165958.GA91607@lor.one-eyed-alien.net> <1D2E12CF-08F2-4151-AB33-84C4270CFBC6@gmail.com> <FE0C5382-DC03-4272-B497-EE9884BC7C2F@gmail.com> <20130424162307.GA16731@lor.one-eyed-alien.net>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Apr 24, 2013, at 9:23 AM, Brooks Davis wrote:
>> …
>> Hi Brooks!
>> Does this look ok? Most of the MK_TESTS logic has been shoved into bsd.own.mk and NO_TESTS is sprinkled around Makefile.inc1 as recommended.
>> Thanks!
>> -Garrett
>
> The functional parts seem fine. Some comments below.
Here's an updated version of the patch with your comments applied.
Thanks!
-Garrett
[-- Attachment #2 --]
Index: Makefile.inc1
===================================================================
--- Makefile.inc1 (revision 249833)
+++ Makefile.inc1 (working copy)
@@ -91,6 +91,9 @@
.if ${MK_OFED} != "no"
SUBDIR+=contrib/ofed
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
#
# We must do etc/ last for install/distribute to work.
#
@@ -253,7 +256,7 @@
SSP_CFLAGS= \
-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -263,12 +266,12 @@
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
-DNO_LINT \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- -DWITHOUT_GDB
+ -DWITHOUT_GDB -DNO_TESTS
# world stage
WMAKEENV= ${CROSSENV} \
@@ -343,7 +346,8 @@
-DLIBRARIES_ONLY \
-DNO_CPU_CFLAGS \
-DNO_CTF \
- -DNO_LINT
+ -DNO_LINT \
+ -DNO_TESTS
LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
@@ -489,7 +493,7 @@
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; \
${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
- -DWITHOUT_MAN -DNO_PROFILE libraries
+ -DWITHOUT_MAN -DNO_PROFILE -DNO_TESTS libraries
_depend:
@echo
@echo "--------------------------------------------------------------"
@@ -1733,7 +1737,7 @@
NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \
- -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
+ -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_TESTS -DNO_WARNS \
TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
CPUTYPE=${XDEV_CPUTYPE}
Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk (revision 249833)
+++ share/mk/bsd.own.mk (working copy)
@@ -378,6 +378,14 @@
OPENSSH_NONE_CIPHER \
SHARED_TOOLCHAIN
+# bsd.test.mk doesn't work with !bmake. Also don't build tests if NO_TESTS is
+# defined; this is for buildworld and elsewhere (ports potentially).
+.if defined(.PARSEDIR) && !defined(NO_TESTS)
+__DEFAULT_NO_OPTIONS+=TESTS
+.else
+MK_TESTS:= no
+.endif
+
#
# Default behaviour of some options depends on the architecture. Unfortunately
# this means that we have to test TARGET_ARCH (the buildworld case) as well
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?C1CCA2E3-C191-4097-895D-CD39F40C8C02>