Replace sftp_server with rsync

remote-run uses rsync instead of sftp server. Some of the tests were
incorrectly labelled as requiring sftp server. Fixed those and replaced
the requirement with rsync.

Author: etcwilde

test/lit.cfg

@@ -2522,19 +2522,16 @@ check_runtime_libs(runtime_libs)
 
 config.substitutions.append(('%target-objc-interop', run_objc_interop))
 
-# For testing the remote-run utility itself, see if we can find an sftp-server
-# binary.
-def find_sftp_server():
-    paths_to_try = ['/usr/libexec/sftp-server', '/usr/lib/sftp-server',
-                    '/usr/libexec/openssh/sftp-server',
-                    '/usr/lib/openssh/sftp-server']
-    return next((path for path in paths_to_try if os.path.isfile(path)), None)
-
-sftp_server_path = find_sftp_server()
-if sftp_server_path:
-    config.available_features.add('sftp_server')
-config.substitutions.append(('%sftp-server',
-                             sftp_server_path or 'no-sftp-server'))
+
+def find_rsync():
+    for path in os.getenv("PATH").split(":"):
+        rsync_path = os.path.join(path, "rsync")
+        if os.path.isfile(rsync_path):
+            return rsync_path
+
+
+if find_rsync():
+    config.available_features.add("rsync")
 
 subst_target_repl_run_simple_swift = ""
 if 'swift_repl' in config.available_features:

test/remote-run/custom-options.test-sh

@@ -1,3 +1,5 @@
+REQUIRES: rsync
+
 RUN: %remote-run -n --remote-dir /xyz-REMOTE -o FIRST_OPT -o SECOND_OPT --output-prefix %/t some_user@some_host:12345 cp %/t/nested/input %/t/nested/output 2>&1 >/dev/null | %FileCheck %s
 
 CHECK: /usr/bin/ssh -n

test/remote-run/download.test-sh

@@ -1,4 +1,4 @@
-REQUIRES: sftp_server
+REQUIRES: rsync
 
 RUN: %empty-directory(%t)
 RUN: %empty-directory(%t-REMOTE)

test/remote-run/dry-run-remote.test-sh

@@ -1,7 +1,9 @@
+REQUIRES: rsync
+
 RUN: %remote-run -n --remote-dir /xyz-REMOTE --input-prefix %S/Inputs/ some_user@some_host ls %S/Inputs/upload/1.txt %S/Inputs/upload/2.txt 2>&1 >/dev/null | %FileCheck -check-prefix CHECK-INPUT %s
 
 CHECK-INPUT: /usr/bin/ssh -n some_user@some_host -- '/usr/bin/env' '/bin/mkdir' '-p' '{{.+}}-REMOTE/input'
-CHECK-INPUT-NEXT: /usr/bin/rsync
+CHECK-INPUT-NEXT: rsync
 CHECK-INPUT-SAME: some_user@some_host
 
 CHECK-INPUT: /usr/bin/ssh -n some_user@some_host -- '/usr/bin/env' {{.*}}'ls'
@@ -12,11 +14,11 @@ RUN: touch %t/nested/input %t/nested/BAD
 RUN: %remote-run -n --remote-dir /xyz-REMOTE --output-prefix %/t some_user@some_host cp %/t/nested/input %/t/nested/output 2>&1 >/dev/null | %FileCheck -check-prefix CHECK-OUTPUT %s
 
 CHECK-OUTPUT: /usr/bin/ssh -n some_user@some_host -- '/usr/bin/env' '/bin/mkdir' '-p' '{{.+}}-REMOTE/output'
-CHECK-OUTPUT-NEXT: /usr/bin/rsync
+CHECK-OUTPUT-NEXT: rsync
 CHECK-OUTPUT-SAME: some_user@some_host
 
 CHECK-OUTPUT: /usr/bin/ssh -n some_user@some_host -- '/usr/bin/env' {{.*}}'cp'
 CHECK-OUTPUT-NEXT: {{^}}/bin/mkdir -p {{.+}}
-CHECK-OUTPUT-NEXT: /usr/bin/rsync
+CHECK-OUTPUT-NEXT: rsync
 CHECK-OUTPUT-SAME: some_user@some_host
 

test/remote-run/dry-run.test-sh

@@ -1,3 +1,4 @@
+REQUIRES: rsync
 REQUIRES: shell
 
 RUN: %empty-directory(%t)

test/remote-run/env.test-sh

@@ -1,3 +1,4 @@
+REQUIRES: rsync
 REQUIRES: shell
 
 RUN: env REMOTE_RUN_CHILD_FOO=foo REMOTE_RUN_CHILD_BAR=bar %debug-remote-run sh -c 'echo ":${FOO}:" ":${BAR}:"' | %FileCheck %s

test/remote-run/exit-code.test-sh

@@ -1,3 +1,4 @@
+REQUIRES: rsync
 REQUIRES: shell
 
 RUN: export SWIFT_BACKTRACE=

test/remote-run/identity.test-sh

@@ -1,3 +1,5 @@
+REQUIRES: rsync
+
 RUN: %remote-run -n --remote-dir /xyz-REMOTE -i spiderman --output-prefix %/t some_user@some_host:12345 cp %/t/nested/input %/t/nested/output 2>&1 >/dev/null | %FileCheck %s
 
 CHECK: /usr/bin/ssh -n

test/remote-run/port.test-sh

@@ -1,3 +1,5 @@
+REQUIRES: rsync
+
 RUN: %remote-run -n --remote-dir /xyz-REMOTE --output-prefix %/t some_user@some_host:12345 cp %/t/nested/input %/t/nested/output 2>&1 >/dev/null | %FileCheck %s
 
 CHECK: /usr/bin/ssh -n -p 12345 some_user@some_host -- '/usr/bin/env' '/bin/mkdir' '-p' '{{.+}}-REMOTE/output/nested'

test/remote-run/run-only.test-sh

@@ -1,3 +1,4 @@
+REQUIRES: rsync
 REQUIRES: shell
 
 RUN: %debug-remote-run echo hello | %FileCheck %s

test/remote-run/stderr.test-sh

@@ -1,3 +1,4 @@
+REQUIRES: rsync
 REQUIRES: shell
 
 RUN: %debug-remote-run sh -c "echo hello; echo goodbye >&2" > %t.stdout.txt 2> %t.stderr.txt

test/remote-run/upload-and-download.test-sh

@@ -1,4 +1,4 @@
-REQUIRES: sftp_server
+REQUIRES: rsync
 
 RUN: %empty-directory(%t)
 RUN: %empty-directory(%t-REMOTE)

test/remote-run/upload-stderr.test-sh

@@ -1,4 +1,4 @@
-REQUIRES: sftp_server
+REQUIRES: rsync
 
 RUN: %empty-directory(%t)
 RUN: %empty-directory(%t/REMOTE/input)

test/remote-run/upload.test-sh

@@ -1,4 +1,4 @@
-REQUIRES: sftp_server
+REQUIRES: rsync
 
 RUN: env REMOTE_RUN_CHILD_FOO=%S/Inputs/upload/3.txt %debug-remote-run --input-prefix %S/Inputs/upload/ ls %S/Inputs/upload/1.txt %S/Inputs/upload/2.txt | %FileCheck -check-prefix CHECK-REMOTE %s
 RUN: ls %t-REMOTE/input/ | %FileCheck %s