More storetest changes (for Windows)

1 files changed, 8 insertions, 6 deletions

diff --git a/scripts/storetest.pl b/scripts/storetest.pl
index 77e486f..9c5b5c4 100755
--- a/scripts/storetest.pl
+++ b/scripts/storetest.pl
@@ -22,10 +22,6 @@ sub sanitizedForFilename {
     return $text;
 }
 
-if (`scp 2>&1` eq "") {
-    die "ERROR: Check for scp failed - is it in PATH?\n";
-}
-
 $args = join " ", @ARGV;
 
 $TESTPLATFORM = prompt("Test platform", $ENV{QTUITEST_PLATFORM});
@@ -96,6 +92,12 @@ close XMLOUT;
 # By using chdir we avoid having to mangle the upload file path
 # on Windows based on whether msys scp is used.
 chdir $RESULTSDIR;
-if (system "scp $UPLOADFILENAME $TESTTESTR") {
-    die "ERROR: Failed to send file using scp.\nPlease check you have entered the correct details.\nThe upload file is: $UPLOADFILE\n";
+
+if (defined $ENV{QTUITEST_SCP}) {
+    $SCP=$ENV{QTUITEST_SCP};
+} else {
+    $SCP = "scp";
+}
+if (system $SCP, $UPLOADFILENAME, $TESTTESTR) {
+    die "ERROR: Failed to send file using $SCP.\nPlease check you have entered the correct details.\nThe upload file is: $UPLOADFILE\n";
 }