paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 20:29:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle log files in root directory (from tests from packages directory)

Browse Source 
git-svn-id: trunk@39175 -
This commit is contained in:
pierre 2018-06-05 20:44:51 +00:00
parent ddf8788c7a
commit da8dc2b841
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/utils/dbdigest.pp
View File

@ -504,10 +504,16 @@ begin
exit;
end;
FN:=ChangeFileExt(FN,'.log');
{ packages tests have ../ replaced by root/ }
if not FileExists(FN) and (Copy(FN,1,3)='../') then
FN:='root/'+Copy(FN,4,length(FN));
If FileExists(FN) then
Result:=GetFileContents(FN)
else
Result:='';
begin
Verbose(V_Warning,'File "'+FN+'" not found');
Result:='';
end;
end;
Function GetExecuteLog(Line, FN : String) : String;
@ -519,10 +525,16 @@ begin
exit;
end;
FN:=ChangeFileExt(FN,'.elg');
{ packages tests have ../ replaced by root/ }
if not FileExists(FN) and (Copy(FN,1,3)='../') then
FN:='root/'+Copy(FN,4,length(FN));
If FileExists(FN) then
Result:=GetFileContents(FN)
else
Result:='';
begin
Verbose(V_Warning,'File "'+FN+'" not found');
Result:='';
end;
end;
Procedure Processfile (FN: String);