diff options
| author | Matthias Braun <matze@braunis.de> | 2018-08-21 23:08:27 +0000 |
|---|---|---|
| committer | Matthias Braun <matze@braunis.de> | 2018-08-21 23:08:27 +0000 |
| commit | 07deaba5c945cd157bfee4b989fb71175da8ba34 (patch) | |
| tree | f2e0485c5d47cf80f9e72769edad83826dc99c85 | |
| parent | 3a582b9abf083da9a65b2fad86b36e9e52792b2e (diff) | |
cmake/litsupport: Remove TEST_SUITE_REMOTE_USER + TEST_SUITE_REMOTE_PORT
Nobody is using these and you can always set them (and many
other) options in your $HOME/.ssh/config file.
git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@340360 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lit.cfg | 1 | ||||
| -rw-r--r-- | lit.site.cfg.in | 2 | ||||
| -rw-r--r-- | litsupport/modules/remote.py | 6 |
4 files changed, 1 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 864c6cc7..dd0d9fa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,9 +64,7 @@ endif() # Remote configuration (will be set in lit.site.cfg) set(TEST_SUITE_REMOTE_CLIENT "ssh" CACHE STRING "Remote execution client") set(TEST_SUITE_REMOTE_HOST "" CACHE STRING "Remote execution host") -set(TEST_SUITE_REMOTE_USER "" CACHE STRING "Remote execution user") -set(TEST_SUITE_REMOTE_PORT "" CACHE STRING "Remote execution port") -mark_as_advanced(TEST_SUITE_REMOTE_CLIENT TEST_SUITE_REMOTE_USER TEST_SUITE_REMOTE_PORT) +mark_as_advanced(TEST_SUITE_REMOTE_CLIENT) # Run Under configuration for RunSafely.sh (will be set in lit.site.cfg) set(TEST_SUITE_RUN_UNDER "" CACHE STRING "RunSafely.sh run-under (-u) parameter") @@ -22,7 +22,6 @@ config.name = 'test-suite' config.test_format = litsupport.test.TestSuiteTest() config.suffixes = ['.test'] config.excludes = ['ABI-Testsuite'] -config.remote_flags = "" config.traditional_output = False config.single_source = False if 'SSH_AUTH_SOCK' in os.environ: diff --git a/lit.site.cfg.in b/lit.site.cfg.in index 609b6cf9..0e2819a4 100644 --- a/lit.site.cfg.in +++ b/lit.site.cfg.in @@ -4,8 +4,6 @@ config.test_source_root = "@CMAKE_BINARY_DIR@" config.test_exec_root = "@CMAKE_BINARY_DIR@" config.remote_client = "@TEST_SUITE_REMOTE_CLIENT@" config.remote_host = "@TEST_SUITE_REMOTE_HOST@" -config.remote_user = "@TEST_SUITE_REMOTE_USER@" -config.remote_port = "@TEST_SUITE_REMOTE_PORT@" config.run_under = "@TEST_SUITE_RUN_UNDER@" config.strip_tool = "@CMAKE_STRIP@" config.profile_generate = @TEST_SUITE_PROFILE_GENERATE@ diff --git a/litsupport/modules/remote.py b/litsupport/modules/remote.py index 887ce0c1..7e93f5e0 100644 --- a/litsupport/modules/remote.py +++ b/litsupport/modules/remote.py @@ -14,12 +14,6 @@ def _mutateCommandline(context, commandline, suffix=""): config = context.config remote_commandline = config.remote_client - if config.remote_user: - remote_commandline += " -l %s" % config.remote_user - if config.remote_port: - remote_commandline += " -p %s" % config.remote_port - if config.remote_flags: - remote_commandline += config.remote_flags remote_commandline += " %s" % config.remote_host remote_commandline += " /bin/sh %s" % shfilename return remote_commandline |