svn commit: r251753 - user/des/tinderbox

Dag-Erling Smørgrav des at FreeBSD.org
Fri Jun 14 18:26:58 UTC 2013


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";
 	}


More information about the svn-src-user mailing list