From owner-svn-src-user@FreeBSD.ORG  Fri Jun 14 18:26:58 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3717B46B;
 Fri, 14 Jun 2013 18:26:58 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 29877114F;
 Fri, 14 Jun 2013 18:26:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EIQvRo024626;
 Fri, 14 Jun 2013 18:26:57 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EIQvoA024625;
 Fri, 14 Jun 2013 18:26:57 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201306141826.r5EIQvoA024625@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Fri, 14 Jun 2013 18:26:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r251753 - user/des/tinderbox
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jun 2013 18:26:58 -0000

Author: des
Date: Fri Jun 14 18:26:57 2013
New Revision: 251753
URL: http://svnweb.freebsd.org/changeset/base/251753

Log:
  Change the error detection logic so it triggers on the first error
  message from make rather than on the last.

Modified:
  user/des/tinderbox/tbmaster.pl

Modified: user/des/tinderbox/tbmaster.pl
==============================================================================
--- user/des/tinderbox/tbmaster.pl	Fri Jun 14 18:11:21 2013	(r251752)
+++ user/des/tinderbox/tbmaster.pl	Fri Jun 14 18:26:57 2013	(r251753)
@@ -37,6 +37,8 @@ my $VERSION	= "2.10";
 my $COPYRIGHT	= "Copyright (c) 2003-2012 Dag-Erling Smørgrav. " .
 		  "All rights reserved.";
 
+my $BACKLOG	= 8;
+
 my $abbreviate;			# Abbreviate path names in log file
 my @configs;			# Names of requested configations
 my $dump;			# Dump configuration and exit
@@ -380,10 +382,10 @@ sub tinderbox($$$) {
 	    @lines = ();
 	    next;
 	}
-	if (/^Stop in /) {
+	if (/^\*\*\*( \[.*?\])? (Error code|Stopped|Signal)/) {
 	    $error = 1;
 	}
-	if (@lines > 10 && !$error) {
+	if (@lines > $BACKLOG && !$error) {
 	    shift(@lines);
 	    $lines[0] = "[...]\n";
 	}