From owner-p4-projects@FreeBSD.ORG  Tue Jan  1 20:30:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5BA6816A41A; Tue,  1 Jan 2008 20:30:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2153816A419
	for <perforce@freebsd.org>; Tue,  1 Jan 2008 20:30:29 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FB7213C44B
	for <perforce@freebsd.org>; Tue,  1 Jan 2008 20:30:29 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m01KUSPt072300
	for <perforce@freebsd.org>; Tue, 1 Jan 2008 20:30:28 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m01KUS90072297
	for perforce@freebsd.org; Tue, 1 Jan 2008 20:30:28 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 1 Jan 2008 20:30:28 GMT
Message-Id: <200801012030.m01KUS90072297@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132253 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jan 2008 20:30:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=132253

Change 132253 by jb@jb_freebsd1 on 2008/01/01 20:29:35

	Get a list of failure directories so that 'make clean' works.
	
	Insist on using an object directory.

Affected files ...

.. //depot/projects/dtrace/src/tools/test/dtrace/Makefile#3 edit

Differences ...

==== //depot/projects/dtrace/src/tools/test/dtrace/Makefile#3 (text+ko) ====

@@ -1393,4 +1393,20 @@
 testtry	: ${DTEST} ${TESTTRY}
 	@${DTEST} ${TESTTRY}
 
+# --------------------------------------------------------------------------------
+# Test failures are written to failure.N directories in the object tree.
+# Get a list of directories in the object tree for 'make clean'.
+
+.if ${.OBJDIR} != ${.CURDIR} && !empty(${.OBJDIR})
+CLEANDIRS!=	cd ${.OBJDIR} && ls -d *
+.endif
+
+# --------------------------------------------------------------------------------
+# Insist on using an object directory. Things get messy otherwsie.
+
+.if ${.OBJDIR} == ${.CURDIR} && !make(obj) && !make(clean) && !make(cleandir)
+.error ERROR: You must run 'make obj' first!
+.endif
+
 .include <bsd.obj.mk>
+