From owner-svn-src-all@FreeBSD.ORG Sun Jan 9 12:55:08 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A88F106564A; Sun, 9 Jan 2011 12:55:08 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [IPv6:2001:4068:10::3]) by mx1.freebsd.org (Postfix) with ESMTP id EBBCF8FC1B; Sun, 9 Jan 2011 12:55:07 +0000 (UTC) Received: from localhost (amavis.fra.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id F0FFC41C7AB; Sun, 9 Jan 2011 13:55:06 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([192.168.74.103]) by localhost (amavis.fra.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id K9qWPeXfAEcj; Sun, 9 Jan 2011 13:55:06 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id 3582941C7AA; Sun, 9 Jan 2011 13:55:06 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 99C8A4448F3; Sun, 9 Jan 2011 12:54:44 +0000 (UTC) Date: Sun, 9 Jan 2011 12:54:44 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Alfred Perlstein In-Reply-To: <200812010045.mB10jpmX007146@svn.freebsd.org> Message-ID: <20110109125302.J14966@maildrop.int.zabbadoz.net> References: <200812010045.mB10jpmX007146@svn.freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r185499 - head X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jan 2011 12:55:08 -0000 On Mon, 1 Dec 2008, Alfred Perlstein wrote: > Author: alfred > Date: Mon Dec 1 00:45:51 2008 > New Revision: 185499 > URL: http://svn.freebsd.org/changeset/base/185499 > > Log: > Provide a 'tinderbox' target that compiles enough of FreeBSD that > a developer can rest reasonably assured that the tinderbox will not > be broken. This target leverages most of 'universe' but will exit > non-zero and output a summary at the end. > > "make tinderbox" Hi, I noticed that the file always grew but was never displayed automatically nor removed on a new run. I guess it's because I have MAKEOBJDIRPREFIX set in the environment and `pwd` is not ${.CURDIR} for the two operations. Anyone see any problems with this? Index: Makefile =================================================================== --- Makefile (revision 217191) +++ Makefile (working copy) @@ -301,7 +301,7 @@ targets: .endfor .if defined(DOING_TINDERBOX) -FAILFILE=tinderbox.failed +FAILFILE=${.CURDIR}/tinderbox.failed MAKEFAIL=tee -a ${FAILFILE} .else MAKEFAIL=cat > Modified: > head/Makefile > > Modified: head/Makefile > ============================================================================== > --- head/Makefile Mon Dec 1 00:23:12 2008 (r185498) > +++ head/Makefile Mon Dec 1 00:45:51 2008 (r185499) > @@ -267,6 +267,10 @@ make: .PHONY > ${MMAKE} all && \ > ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR= > > +tinderbox: > + cd ${.CURDIR} && \ > + DOING_TINDERBOX=YES ${MAKE} ${JFLAG} universe > + > # > # universe > # > @@ -274,14 +278,24 @@ make: .PHONY > # with a reasonable chance of success, regardless of how old your > # existing system is. > # > -.if make(universe) > +.if make(universe) || make(tinderbox) > TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v > > +.if defined(DOING_TINDERBOX) > +FAILFILE=tinderbox.failed > +MAKEFAIL=tee -a ${FAILFILE} > +.else > +MAKEFAIL=cat > +.endif > + > universe: universe_prologue > universe_prologue: > @echo "--------------------------------------------------------------" > @echo ">>> make universe started on ${STARTTIME}" > @echo "--------------------------------------------------------------" > +.if defined(DOING_TINDERBOX) > + rm -f ${FAILFILE} > +.endif > .for target in ${TARGETS} > KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ > find [A-Z]*[A-Z] -type f -maxdepth 0 \ > @@ -296,15 +310,15 @@ universe_${target}: > ${MAKE} ${JFLAG} buildworld \ > TARGET=${target} \ > > _.${target}.buildworld 2>&1 || \ > - echo "${target} world failed," \ > - "check _.${target}.buildworld for details") > + (echo "${target} world failed," \ > + "check _.${target}.buildworld for details" | ${MAKEFAIL})) > @echo ">> ${target} buildworld completed on `LC_ALL=C date`" > .endif > .if exists(${.CURDIR}/sys/${target}/conf/NOTES) > @(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \ > ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ > - echo "${target} 'make LINT' failed," \ > - "check _.${target}.makeLINT for details") > + (echo "${target} 'make LINT' failed," \ > + "check _.${target}.makeLINT for details"| ${MAKEFAIL})) > .endif > .for kernel in ${KERNCONFS} > @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ > @@ -312,8 +326,8 @@ universe_${target}: > TARGET=${target} \ > KERNCONF=${kernel} \ > > _.${target}.${kernel} 2>&1 || \ > - echo "${target} ${kernel} kernel failed," \ > - "check _.${target}.${kernel} for details") > + (echo "${target} ${kernel} kernel failed," \ > + "check _.${target}.${kernel} for details"| ${MAKEFAIL})) > .endfor > @echo ">> ${target} completed on `LC_ALL=C date`" > .endfor > @@ -323,4 +337,11 @@ universe_epilogue: > @echo ">>> make universe completed on `LC_ALL=C date`" > @echo " (started ${STARTTIME})" > @echo "--------------------------------------------------------------" > +.if defined(DOING_TINDERBOX) > + @if [ -e ${FAILFILE} ] ; then \ > + echo "Tinderbox failed:" ;\ > + cat ${FAILFILE} ;\ > + exit 1 ;\ > + fi > +.endif > .endif > -- Bjoern A. Zeeb You have to have visions! Going to jail sucks -- All my daemons like it! http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/jails.html