Fixed remaining remote target failures in TestSettings.py
needed to copy an output file back from remote target
skipped test that expects host env vars to be inherited by target
processes
llvm-svn: 229764
diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py
index 5043fa8..c7cfe6c 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/test/settings/TestSettings.py
@@ -212,7 +212,6 @@
self.buildDwarf()
self.pass_run_args_and_env_vars()
- @not_remote_testsuite_ready
def pass_run_args_and_env_vars(self):
"""Test that run-args and env-vars are passed to the launched process."""
exe = os.path.join(os.getcwd(), "a.out")
@@ -230,6 +229,8 @@
self.runCmd("run", RUN_SUCCEEDED)
# Read the output file produced by running the program.
+ if lldb.remote_platform:
+ self.runCmd('platform get-file "output2.txt" "output2.txt"')
with open('output2.txt', 'r') as f:
output = f.read()
@@ -239,7 +240,7 @@
"argv[3] matches",
"Environment variable 'MY_ENV_VAR' successfully passed."])
- @not_remote_testsuite_ready
+ @skipIfRemote # it doesn't make sense to send host env to remote target
def test_pass_host_env_vars(self):
"""Test that the host env vars are passed to the launched process."""
self.buildDefault()
@@ -264,6 +265,8 @@
self.runCmd("run", RUN_SUCCEEDED)
# Read the output file produced by running the program.
+ if lldb.remote_platform:
+ self.runCmd('platform get-file "output1.txt" "output1.txt"')
with open('output1.txt', 'r') as f:
output = f.read()
@@ -271,7 +274,6 @@
substrs = ["The host environment variable 'MY_HOST_ENV_VAR1' successfully passed.",
"The host environment variable 'MY_HOST_ENV_VAR2' successfully passed."])
- @not_remote_testsuite_ready
def test_set_error_output_path(self):
"""Test that setting target.error/output-path for the launched process works."""
self.buildDefault()