From f4802155228bd5a035d9d89afd095d8a6d8515e4 Mon Sep 17 00:00:00 2001
From: yury <jura@cp-lab.com>
Date: Mon, 27 Jan 2020 14:50:56 +0000
Subject: [PATCH] Merged revision(s) 39911 from trunk: * 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 -
---
 tests/utils/dotest.pp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/utils/dotest.pp b/tests/utils/dotest.pp
index 6f49bdf73f..d66e1b29dd 100644
--- a/tests/utils/dotest.pp
+++ b/tests/utils/dotest.pp
@@ -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