Browse Source

* Patches from Pierre

Michaël Van Canneyt 6 months ago
parent
commit
38e2cea533
3 changed files with 6 additions and 5 deletions
  1. 1 1
      tests/utils/Makefile
  2. 1 1
      tests/utils/Makefile.fpc
  3. 4 3
      tests/utils/digestanalyst.pas

+ 1 - 1
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) $<

+ 1 - 1
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)

+ 4 - 3
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