2 files changed, 14 insertions, 6 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py b/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
index b193c81e644..02110d1684f 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 -o stdout.txt -- " + args_in)
+        self.runCmd("process launch -- " + args_in)
 
         if lldb.remote_platform:
-            src_file_spec = lldb.SBFileSpec('stdout.txt', False)
-            dst_file_spec = lldb.SBFileSpec('stdout.txt', True)
+            src_file_spec = lldb.SBFileSpec('output.txt', False)
+            dst_file_spec = lldb.SBFileSpec('output.txt', True)
             lldb.remote_platform.Get(src_file_spec, dst_file_spec)
 
-        with open('stdout.txt', 'r') as f:
+        with open('output.txt', 'r') as f:
             output = f.read()
 
-        self.RemoveTempFile("stdout.txt")
+        self.RemoveTempFile("output.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 6e01c2d1cd8..5e3e34f84a6 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/quoting/main.c
+++ b/lldb/packages/Python/lldbsuite/test/settings/quoting/main.c
@@ -1,13 +1,21 @@
 #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, stdout);
+        fwrite(argv[i], strlen(argv[i])+1, 1, output);
+
+    fclose (output);
 
     return 0;
 }