From c8f7e44a49c8596dbb925922a6f448676a15e5c7 Mon Sep 17 00:00:00 2001
From: Martin Corino <mcorino@remedy.nl>
Date: Mon, 13 Mar 2017 14:38:01 +0100
Subject: Improvements for remote/avd target testing

---
 ACE/bin/PerlACE/TestTarget.pm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/ACE/bin/PerlACE/TestTarget.pm b/ACE/bin/PerlACE/TestTarget.pm
index f37529cdf0d..de838de5797 100644
--- a/ACE/bin/PerlACE/TestTarget.pm
+++ b/ACE/bin/PerlACE/TestTarget.pm
@@ -329,6 +329,10 @@ sub GetConfigSettings ($)
     if (exists $ENV{$env_name}) {
         $self->{REMOTE_FILETEST} = $ENV{$env_name};
     }
+    $env_name = $env_prefix.'REMOTE_FILERM';
+    if (exists $ENV{$env_name}) {
+        $self->{REMOTE_FILERM} = $ENV{$env_name};
+    }
     $env_name = $env_prefix.'PS_CMD';
     if (exists $ENV{$env_name}) {
         $self->{PS_CMD} = $ENV{$env_name};
@@ -542,7 +546,22 @@ sub DeleteFile ($)
     my $self = shift;
     my $file = shift;
     my $newfile = $self->LocalFile($file);
-    unlink ($newfile);
+    my $remote_rm = (defined $self->{REMOTE_FILERM}) ? 1 : 0;
+    if ((($file eq $newfile) ||
+        (File::Spec->rel2abs($file) eq File::Spec->rel2abs($newfile))) &&
+        !(defined $self->{REMOTE_FILERM})) {
+        unlink ($newfile);
+    } else {
+        my $cmd;
+        if ($self->{REMOTE_FILERM} =~ /^\d*$/) {
+            $cmd = $self->{REMOTE_SHELL} . " 'test -e $newfile && rm $newfile'";
+        } else {
+            $cmd = $self->{REMOTE_FILERM} . ' ' . $newfile;
+        }
+        if (system ($cmd) != 0) {
+        	print STDERR "ERROR executing [".$cmd."]\n";
+        }
+    }
 }
 
 sub GetFile ($)
-- 
cgit v1.2.1