Fixed remaining remote target failures in TestSettings.py

[vharron]

Summary

needed to copy an output file back from remote target
skipped test that expects host env vars to be inherited by target
processes

[vharron]

Committed revision 229764.

test/settings/TestSettings.py

def test_run_args_and_env_vars_with_dsym(self):
         self.pass_run_args_and_env_vars()
 
     @dwarf_test
     def test_run_args_and_env_vars_with_dwarf(self):
         """Test that run-args and env-vars are passed to the launched process."""
         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")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         # Set the run-args and the env-vars.
         # And add hooks to restore the settings during tearDown().
         self.runCmd('settings set target.run-args A B C')
         self.addTearDownHook(
             lambda: self.runCmd("settings clear target.run-args"))
         self.runCmd('settings set target.env-vars ["MY_ENV_VAR"]=YES')
         self.addTearDownHook(
             lambda: self.runCmd("settings clear target.env-vars"))
 
         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()
 
         self.expect(output, exe=False,
             substrs = ["argv[1] matches",
                        "argv[2] matches",
                        "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()
 
         exe = os.path.join(os.getcwd(), "a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         # By default, inherit-env is 'true'.
         self.expect('settings show target.inherit-env', "Default inherit-env is 'true'",
             startstr = "target.inherit-env (boolean) = true")
 
         # Set some host environment variables now.
         os.environ["MY_HOST_ENV_VAR1"] = "VAR1"
         os.environ["MY_HOST_ENV_VAR2"] = "VAR2"
 
         # This is the function to unset the two env variables set above.
         def unset_env_variables():
             os.environ.pop("MY_HOST_ENV_VAR1")
             os.environ.pop("MY_HOST_ENV_VAR2")
 
         self.addTearDownHook(unset_env_variables)
         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()
 
         self.expect(output, exe=False,
             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()
 
         exe = os.path.join(os.getcwd(), "a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         # Set the error-path and output-path and verify both are set.