paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 21:11:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move getting error address / only execute when needed

Browse Source
This commit is contained in:
Martin 2025-06-17 13:43:31 +02:00
parent 1d006185ef
commit 3a89160739
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/fcl-fpcunit/src/fpcunit.pp
View File

@ -1387,8 +1387,6 @@ class procedure TAssert.AssertException(const AMessage: string; const AFormatArg
var var
Msg,FailMsg : string; Msg,FailMsg : string;
begin begin
If AErrorAddr=Nil then
AErrorAddr:=CallerAddr;
FailMsg:=''; FailMsg:='';
try try
AMethod; AMethod;
@ -1414,6 +1412,8 @@ begin
end; end;
if aMessage<>'' then if aMessage<>'' then
Msg:=Format(AMessage, AFormatArgs) + ': '+Msg; Msg:=Format(AMessage, AFormatArgs) + ': '+Msg;
If AErrorAddr=Nil then
AErrorAddr:=CallerAddr;
Fail(Msg, AErrorAddr); Fail(Msg, AErrorAddr);
end; end;
@ -1486,8 +1486,6 @@ var
Msg,FailMsg : string; Msg,FailMsg : string;
begin begin
If AErrorAddr=Nil then
AErrorAddr:=CallerAddr;
FailMsg:=''; FailMsg:='';
try try
AMethod; AMethod;
@ -1513,6 +1511,8 @@ begin
end; end;
if aMessage<>'' then if aMessage<>'' then
Msg:=Format(AMessage, AFormatArgs) + ': '+Msg; Msg:=Format(AMessage, AFormatArgs) + ': '+Msg;
If AErrorAddr=Nil then
AErrorAddr:=CallerAddr;
Fail(Msg, AErrorAddr); Fail(Msg, AErrorAddr);
end; end;