[Lldb-commits] [lldb] r229764 - Fixed remaining remote target failures in TestSettings.py

[Vince Harron]

Author: vharron
Date: Wed Feb 18 17:14:49 2015
New Revision: 229764

URL: http://llvm.org/viewvc/llvm-project?rev=229764&view=rev
Log:
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


Modified:
    lldb/trunk/test/settings/TestSettings.py

Modified: lldb/trunk/test/settings/TestSettings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/settings/TestSettings.py?rev=229764&r1=229763&r2=229764&view=diff
==============================================================================
--- lldb/trunk/test/settings/TestSettings.py (original)
+++ lldb/trunk/test/settings/TestSettings.py Wed Feb 18 17:14:49 2015
@@ -212,7 +212,6 @@ class SettingsCommandTestCase(TestBase):
         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 @@ class SettingsCommandTestCase(TestBase):
         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 @@ class SettingsCommandTestCase(TestBase):
                        "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 @@ class SettingsCommandTestCase(TestBase):
         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 @@ class SettingsCommandTestCase(TestBase):
             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()