From owner-p4-projects@FreeBSD.ORG  Sun Dec  3 00:51:11 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E227716A412; Sun,  3 Dec 2006 00:51:10 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8A1AE16A403
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 00:51:10 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0885543C9D
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 00:50:47 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB30pAGu094850
	for <perforce@freebsd.org>; Sun, 3 Dec 2006 00:51:10 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB30pA7R094842
	for perforce@freebsd.org; Sun, 3 Dec 2006 00:51:10 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 3 Dec 2006 00:51:10 GMT
Message-Id: <200612030051.kB30pA7R094842@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 110900 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: Sun, 03 Dec 2006 00:51:11 -0000

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

Change 110900 by jb@jb_freebsd8 on 2006/12/03 00:50:34

	On FreeBSD we have less control over our source base. Failing
	in a CTF tool shouldn't make us fail a build, so exit with
	no error after outputting the whinge-message.

Affected files ...

.. //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/util.c#3 edit

Differences ...

==== //depot/projects/opensolaris/contrib/opensolaris/tools/ctf/cvt/util.c#3 (text) ====

@@ -148,7 +148,17 @@
 
 	if (getenv("CTF_ABORT_ON_TERMINATE") != NULL)
 		abort();
+#if defined(__FreeBSD__)
+/*
+ * For the time being just output the termination message, but don't
+ * return an exit status that would cause the build to fail. We need
+ * to get as much stuff built as possible before going back and
+ * figuring out what is wrong with certain files.
+ */
+	exit(0);
+#else
 	exit(1);
+#endif
 }
 
 /*PRINTFLIKE1*/
@@ -161,7 +171,11 @@
 	whine("ERROR", format, ap);
 	va_end(ap);
 
+#if defined(sun)
 	abort();
+#else
+	exit(0);
+#endif
 }
 
 /*PRINTFLIKE1*/