Revert this patch; I was emailing with Eugene and they have some other changes going

in today and don't want the two changes to confuse the situation with the build bots.
I'll commit tomorrow once they're known good.

llvm-svn: 313934

3 files changed, 6 insertions, 16 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py b/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py
index 36ca7d7e418..a8bd57341ed 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py
+++ b/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py
@@ -215,7 +215,6 @@ class SettingsCommandTestCase(TestBase):
         self.expect("disassemble -n numberfn",
                     substrs=["5ah"])
 
-    @skipIfDarwinEmbedded   # debugserver on ios etc can't write files
     def test_run_args_and_env_vars(self):
         """Test that run-args and env-vars are passed to the launched process."""
         self.build()
@@ -287,7 +286,6 @@ class SettingsCommandTestCase(TestBase):
                 "The host environment variable 'MY_HOST_ENV_VAR1' successfully passed.",
                 "The host environment variable 'MY_HOST_ENV_VAR2' successfully passed."])
 
-    @skipIfDarwinEmbedded   # debugserver on ios etc can't write files
     def test_set_error_output_path(self):
         """Test that setting target.error/output-path for the launched process works."""
         self.build()
diff --git a/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py b/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
index 02110d1684f..b193c81e644 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
+++ b/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
@@ -82,16 +82,16 @@ class SettingsCommandTestCase(TestBase):
         exe = os.path.join(os.getcwd(), "a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
-        self.runCmd("process launch -- " + args_in)
+        self.runCmd("process launch -o stdout.txt -- " + args_in)
 
         if lldb.remote_platform:
-            src_file_spec = lldb.SBFileSpec('output.txt', False)
-            dst_file_spec = lldb.SBFileSpec('output.txt', True)
+            src_file_spec = lldb.SBFileSpec('stdout.txt', False)
+            dst_file_spec = lldb.SBFileSpec('stdout.txt', True)
             lldb.remote_platform.Get(src_file_spec, dst_file_spec)
 
-        with open('output.txt', 'r') as f:
+        with open('stdout.txt', 'r') as f:
             output = f.read()
 
-        self.RemoveTempFile("output.txt")
+        self.RemoveTempFile("stdout.txt")
 
         self.assertEqual(output, args_out)
diff --git a/lldb/packages/Python/lldbsuite/test/settings/quoting/main.c b/lldb/packages/Python/lldbsuite/test/settings/quoting/main.c
index 5e3e34f84a6..6e01c2d1cd8 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/quoting/main.c
+++ b/lldb/packages/Python/lldbsuite/test/settings/quoting/main.c
@@ -1,21 +1,13 @@
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 
 /* This program writes its arguments (separated by '\0') to stdout. */
 int
 main(int argc, char const *argv[])
 {
     int i;
-
-    FILE *output = fopen ("output.txt", "w");
-    if (output == NULL)
-        exit (1);
-
     for (i = 1; i < argc; ++i)
-        fwrite(argv[i], strlen(argv[i])+1, 1, output);
-
-    fclose (output);
+        fwrite(argv[i], strlen(argv[i])+1, 1, stdout);
 
     return 0;
 }