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

Merged revision(s) 39911 from trunk:

Browse Source 
* dotest: When executing a remote test, prevent overwrite of the test's result and log by final cleanup commands.
........

git-svn-id: branches/fixes_3_2@44046 -
This commit is contained in:
yury 2020-01-27 14:50:56 +00:00
parent abe5757702
commit f480215522
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/utils/dotest.pp
View File

@ -1292,6 +1292,7 @@ var
execres : boolean;
EndTicks,
StartTicks : int64;
OldExecuteResult: longint;
begin
RunExecutable:=false;
execres:=true;
@ -1369,6 +1370,7 @@ begin
if (deAfter in DelExecutable) and
not Config.NeededAfter then
begin
{ Delete executable if not needed after }
execcmd:=execcmd+' ; rm ';
if rshprog <> 'adb' then
execcmd:=execcmd+'-f ';
@ -1395,7 +1397,16 @@ begin
execcmd:=execcmd + 'rm ' + s;
execcmd:=execcmd + '; ';
end;
ExecuteRemote(rshprog,execcmd+'}'+rquote,StartTicks,EndTicks);
execcmd:=execcmd+'}'+rquote;
// Save ExecuteResult and EXELogFile
OldExecuteResult:=ExecuteResult;
s:=EXELogFile;
// Output results of cleanup commands to stdout
EXELogFile:='';
ExecuteRemote(rshprog,execcmd,StartTicks,EndTicks);
// Restore
EXELogFile:=s;
ExecuteResult:=OldExecuteResult;
end;
end
else