From e7ae1f9152a492f43193e216db44334dad54d5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Sun, 2 Mar 2025 12:09:00 +0100 Subject: [PATCH] * Handle "internalerror generated" suffix found in log file, but not in longlog --- tests/utils/digestanalyst.pas | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/utils/digestanalyst.pas b/tests/utils/digestanalyst.pas index 51eaa870d9..bd11e19d2b 100644 --- a/tests/utils/digestanalyst.pas +++ b/tests/utils/digestanalyst.pas @@ -31,6 +31,7 @@ Type UnknownLines : integer; UseLongLog : Boolean; FCurLongLogLine : Integer; + FLongLogRestartCount : Integer; FPrefix : String; // Call global verbose with prefix to message. procedure Verbose(aLevel : TVerboseLevel; const aMsg : string); @@ -188,11 +189,17 @@ function TDBDigestAnalyzer.GetContentsFromLongLog(Line: String): String; var S : String; IsFirst, IsFound : boolean; + InternalErrorPos : Integer; begin Result:=''; - IsFirst:=true; - IsFound:=false; + { The "internalerror generated" message is not present in compilation log } + InternalErrorPos:=pos(' internalerror generated',Line); + if (InternalErrorPos>0) then + begin + Line:=Copy(Line,1,InternalErrorPos-1); + end;IsFirst:=true; + IsFound:=false; While HaveLongLogLine do begin S:=GetLongLogLine; @@ -227,6 +234,7 @@ begin begin Verbose(V_Warning,'Line "'+Line+'" not found'); FCurlongLogLine:=0; // Reset + Inc(FLongLogRestartCount); end; end;