Skip to content

remote-run: make tests partially pass on Windows #20961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2018
Merged

remote-run: make tests partially pass on Windows #20961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/remote-run/custom-options.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RUN: %utils/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
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
CHECK-DAG: -p 12345
Expand Down
4 changes: 2 additions & 2 deletions test/remote-run/dry-run-remote.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RUN: %utils/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
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/upload'
CHECK-INPUT-NEXT: /usr/bin/sftp
Expand All @@ -10,7 +10,7 @@ CHECK-INPUT: /usr/bin/ssh -n some_user@some_host -- '/usr/bin/env' 'ls'
RUN: %empty-directory(%t)
RUN: %empty-directory(%t/nested)
RUN: touch %t/nested/input %t/nested/BAD
RUN: %utils/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
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/nested'
CHECK-OUTPUT-NEXT: /usr/bin/sftp
Expand Down
2 changes: 2 additions & 0 deletions test/remote-run/dry-run.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
REQUIRES: shell

RUN: %empty-directory(%t)
RUN: %debug-remote-run -n --input-prefix %S/Inputs/ ls %S/Inputs/upload/1.txt %S/Inputs/upload/2.txt 2>&1 >/dev/null | %FileCheck -check-prefix CHECK-INPUT %s
RUN: test -z "`ls %t`"
Expand Down
2 changes: 2 additions & 0 deletions test/remote-run/env.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
REQUIRES: shell

RUN: env REMOTE_RUN_CHILD_FOO=foo REMOTE_RUN_CHILD_BAR=bar %debug-remote-run sh -c 'echo ":${FOO}:" ":${BAR}:"' | %FileCheck %s
RUN: env REMOTE_RUN_CHILD_FOO=foo REMOTE_RUN_CHILD_BAR=bar %debug-remote-run -v sh -c 'echo ":${FOO}:" ":${BAR}:"' 2>&1 >/dev/null | %FileCheck -check-prefix VERBOSE %s

Expand Down
2 changes: 2 additions & 0 deletions test/remote-run/exit-code.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
REQUIRES: shell

RUN: not %debug-remote-run false >%t.txt 2>%t.errs.txt
RUN: test -f %t.txt -a ! -s %t.txt
RUN: test -f %t.errs.txt -a ! -s %t.errs.txt
4 changes: 2 additions & 2 deletions test/remote-run/identity.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RUN: %utils/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
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
CHECK-DAG: -p 12345
Expand Down Expand Up @@ -32,7 +32,7 @@ CHECK-DAG: -get '/xyz-REMOTE/output/nested/output' '{{.+}}/nested/output'
CHECK-DAG: -get '/xyz-REMOTE/output/nested/input' '{{.+}}/nested/input'

# Make sure things work without a port.
RUN: %utils/remote-run -n --remote-dir /xyz-REMOTE -i spiderman --output-prefix %t some_user@some_host cp %t/nested/input %t/nested/output 2>&1 >/dev/null | %FileCheck -check-prefix CHECK-PORTLESS %s
RUN: %remote-run -n --remote-dir /xyz-REMOTE -i spiderman --output-prefix %/t some_user@some_host cp %/t/nested/input %/t/nested/output 2>&1 >/dev/null | %FileCheck -check-prefix CHECK-PORTLESS %s

CHECK-PORTLESS: /usr/bin/sftp
CHECK-PORTLESS-SAME: -i spiderman
Expand Down
4 changes: 3 additions & 1 deletion test/remote-run/lit.local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
config.substitutions = list(config.substitutions)

config.substitutions.insert(0, ('%debug-remote-run',
'%utils/remote-run --debug-as-local %sftp-server --remote-dir %t-REMOTE') )
r'%r %%utils/remote-run --debug-as-local %%sftp-server --remote-dir %%t-REMOTE' % (sys.executable,)))
config.substitutions.insert(0, ('%remote-run',
r'%r %%utils/remote-run' % (sys.executable,)))
2 changes: 1 addition & 1 deletion test/remote-run/port.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RUN: %utils/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
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'
CHECK-NEXT: /usr/bin/sftp
Expand Down
2 changes: 2 additions & 0 deletions test/remote-run/run-only.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
REQUIRES: shell

RUN: %debug-remote-run echo hello | %FileCheck %s
RUN: %debug-remote-run -v echo hello 2>&1 >/dev/null | %FileCheck -check-prefix VERBOSE %s

Expand Down
2 changes: 2 additions & 0 deletions test/remote-run/stderr.test-sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
REQUIRES: shell

RUN: %debug-remote-run sh -c "echo hello; echo goodbye >&2" > %t.stdout.txt 2> %t.stderr.txt
RUN: %FileCheck -check-prefix CHECK-STDOUT %s < %t.stdout.txt
RUN: %FileCheck -check-prefix CHECK-STDERR %s < %t.stderr.txt
Expand Down
13 changes: 7 additions & 6 deletions utils/remote-run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
from __future__ import print_function

import argparse
import os.path
import os
import posixpath
import subprocess
import sys

Expand All @@ -28,7 +29,7 @@ class CommandRunner(object):

@staticmethod
def _dirnames(files):
return sorted(set(os.path.dirname(f) for f in files))
return sorted(set(posixpath.dirname(f) for f in files))

def popen(self, command, **kwargs):
if self.verbose:
Expand Down Expand Up @@ -136,8 +137,8 @@ class LocalCommandRunner(CommandRunner):
return ['/usr/bin/sftp', '-b', '-', '-q', '-D', self.sftp_server_path]

def find_transfers(args, source_prefix, dest_prefix):
if source_prefix.endswith(os.path.sep):
source_prefix = source_prefix[:-len(os.path.sep)]
if source_prefix.endswith(posixpath.sep):
source_prefix = source_prefix[:-len(posixpath.sep)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arguably these should be using host-style paths, but I guess the tests aren't going to do that any time soon.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that some of it needs to be host style and some of it target style. However, since we can always use / even on Windows, I think we can get away with this. The target style paths will be needed at some point, and we can deal with it then.

return dict((arg, dest_prefix + arg[len(source_prefix):])
for arg in args if arg.startswith(source_prefix))

Expand Down Expand Up @@ -202,14 +203,14 @@ def main():
remote_test_specific_dir = None
if args.input_prefix:
assert not args.remote_input_prefix.startswith("..")
remote_dir = os.path.join(args.remote_dir, args.remote_input_prefix)
remote_dir = posixpath.join(args.remote_dir, args.remote_input_prefix)
input_files = find_transfers(args.command, args.input_prefix,
remote_dir)
assert not any(upload_files.has_key(f) for f in input_files)
upload_files.update(input_files)
if args.output_prefix:
assert not args.remote_output_prefix.startswith("..")
remote_dir = os.path.join(args.remote_dir, args.remote_output_prefix)
remote_dir = posixpath.join(args.remote_dir, args.remote_output_prefix)
test_files = find_transfers(args.command, args.output_prefix,
remote_dir)
assert not any(upload_files.has_key(f) for f in test_files)
Expand Down