From 38e2cea5336a5a17f741000a1eefab36dd0efafa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Sat, 18 Jan 2025 15:51:01 +0100
Subject: [PATCH] * Patches from Pierre

---
 tests/utils/Makefile          | 2 +-
 tests/utils/Makefile.fpc      | 2 +-
 tests/utils/digestanalyst.pas | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/utils/Makefile b/tests/utils/Makefile
index fe919755a5..9b4fcf385c 100644
--- a/tests/utils/Makefile
+++ b/tests/utils/Makefile
@@ -2412,7 +2412,7 @@ endif
 utils: all
 dbconfig$(SRCEXEEXT): dbconfig.pp teststr$(PPUEXT) testu$(PPUEXT) tresults$(PPUEXT) dbtests$(PPUEXT)
 	$(COMPILER) $<
-dbdigest$(SRCEXEEXT): dbdigest.pp teststr$(PPUEXT) testu$(PPUEXT) tresults$(PPUEXT) dbtests$(PPUEXT)
+dbdigest$(SRCEXEEXT): dbdigest.pp digestanalyst$(PPUEXT) teststr$(PPUEXT) testu$(PPUEXT) tresults$(PPUEXT) dbtests$(PPUEXT)
 	$(COMPILER) $<
 digest$(SRCEXEEXT): digest.pp teststr$(PPUEXT)
 	$(COMPILER) $<
diff --git a/tests/utils/Makefile.fpc b/tests/utils/Makefile.fpc
index b8baf60776..1cb47a7eb0 100644
--- a/tests/utils/Makefile.fpc
+++ b/tests/utils/Makefile.fpc
@@ -37,7 +37,7 @@ utils: all
 dbconfig$(SRCEXEEXT): dbconfig.pp teststr$(PPUEXT) testu$(PPUEXT) tresults$(PPUEXT) dbtests$(PPUEXT)
         $(COMPILER) $<
 
-dbdigest$(SRCEXEEXT): dbdigest.pp teststr$(PPUEXT) testu$(PPUEXT) tresults$(PPUEXT) dbtests$(PPUEXT)
+dbdigest$(SRCEXEEXT): dbdigest.pp digestanalyst$(PPUEXT) teststr$(PPUEXT) testu$(PPUEXT) tresults$(PPUEXT) dbtests$(PPUEXT)
         $(COMPILER) $<
 
 digest$(SRCEXEEXT): digest.pp teststr$(PPUEXT)
diff --git a/tests/utils/digestanalyst.pas b/tests/utils/digestanalyst.pas
index fc1cc51755..016fac190b 100644
--- a/tests/utils/digestanalyst.pas
+++ b/tests/utils/digestanalyst.pas
@@ -101,6 +101,7 @@ begin
     begin
     LongLogFile:=TStringList.Create;
     LongLogFile.LoadFromFile(aData.longlogfile);
+    UseLongLog:=LongLogFile.Count>0;
     end;
   if not GetIDS(aConfig,aData) then
     exit;
@@ -356,15 +357,15 @@ begin
         If not AnalyseLine(line,TS) then
           begin
           Inc(UnknownLines);
-          Verbose(V_Warning,'Unknown line: "'+line+'"');
+          Verbose(V_Warning,'Unknown line: "'+fullline+'"');
           end
         else
           begin
-          Verbose(V_NORMAL,'Analysing result for test '+Line);
+          Verbose(V_NORMAL,'Analysing result for test '+fullLine);
           lResult.TestID:=FDB.RequireTestID(line);
           if lResult.TestID=-1 then
             begin
-            Verbose(V_Warning,'No test ID: "'+line+'", skipping');
+            Verbose(V_Warning,'No test ID: "'+fullline+'", skipping');
             Continue;
             end;
           If ExpectRun[TS] then