Skip to content

Commit dedfe16

Browse files
authored
Merge pull request #64175 from al45tair/eng/PR-106294557
[Remote Test] Fix remote-run to process environment variables.
2 parents d6cef2c + fdb0104 commit dedfe16

File tree

4 files changed

+219
-87
lines changed

4 files changed

+219
-87
lines changed

test/Runtime/Paths.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
// RUN: %target-run %t/paths-test | %FileCheck %s
1111
// RUN: env %env-SWIFT_ROOT=%t/swift-root %target-run %t/paths-test | %FileCheck %s --check-prefix CHECK-FR
1212
// REQUIRES: executable_test
13-
// UNSUPPORTED: remote_run
1413

1514
// This can't be done in unittests, because that statically links the runtime
1615
// so we get the wrong paths. We explicitly want to test that we get the

test/remote-run/Inputs/upload/3.txt

Whitespace-only changes.

test/remote-run/upload.test-sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
REQUIRES: sftp_server
22

3-
RUN: %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
3+
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
44
RUN: ls %t-REMOTE/input/ | %FileCheck %s
55

66
RUN: %empty-directory(%t-REMOTE)
7-
RUN: %debug-remote-run --input-prefix %S/Inputs/ ls %S/Inputs/upload/1.txt %S/Inputs/upload/2.txt | %FileCheck -check-prefix CHECK-REMOTE-NESTED %s
7+
RUN: env REMOTE_RUN_CHILD_FOO=%S/Inputs/upload/3.txt %debug-remote-run --input-prefix %S/Inputs/ ls %S/Inputs/upload/1.txt %S/Inputs/upload/2.txt | %FileCheck -check-prefix CHECK-REMOTE-NESTED %s
88
RUN: ls %t-REMOTE/input/upload/ | %FileCheck %s
99
RUN: %debug-remote-run -v --input-prefix %S/Inputs/ ls %S/Inputs/upload/1.txt %S/Inputs/upload/2.txt 2>&1 >/dev/null | %FileCheck -check-prefix VERBOSE-NESTED %s
1010

@@ -13,7 +13,7 @@ RUN: %debug-remote-run --input-prefix %S/Inputs/upload/1 ls %S/Inputs/upload/1.t
1313
RUN: test -f %t-REMOTE/input/1.txt
1414

1515
RUN: %empty-directory(%t-REMOTE)
16-
RUN: %debug-remote-run --input-prefix %S/Inputs/upload/ --remote-input-prefix custom-input ls %S/Inputs/upload/1.txt %S/Inputs/upload/2.txt | %FileCheck -check-prefix CHECK-REMOTE-CUSTOM %s
16+
RUN: env REMOTE_RUN_CHILD_FOO=%S/Inputs/upload/3.txt %debug-remote-run --input-prefix %S/Inputs/upload/ --remote-input-prefix custom-input ls %S/Inputs/upload/1.txt %S/Inputs/upload/2.txt | %FileCheck -check-prefix CHECK-REMOTE-CUSTOM %s
1717
RUN: ls %t-REMOTE/custom-input/ | %FileCheck %s
1818

1919
CHECK-REMOTE: {{-REMOTE/input/1.txt$}}
@@ -30,6 +30,7 @@ CHECK-REMOTE-CUSTOM-NEXT: {{-REMOTE/custom-input/2.txt$}}
3030
CHECK-NOT: BAD
3131
CHECK: {{^1.txt$}}
3232
CHECK-NEXT: {{^2.txt$}}
33+
CHECK-NEXT: {{^3.txt$}}
3334
CHECK-NOT: BAD
3435

3536
VERBOSE-NESTED: /usr/bin/env /bin/mkdir -p {{.+}}-REMOTE/input

0 commit comments

Comments
 (0)