3 files changed, 79 insertions, 0 deletions
diff --git a/lldb/test/settings/Makefile b/lldb/test/settings/Makefile
new file mode 100644
index 00000000000..d4bc9c68904
--- /dev/null
+++ b/lldb/test/settings/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py
index 7d549db09d6..f18c0bc9d6e 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/test/settings/TestSettings.py
@@ -39,6 +39,36 @@ class SettingsCommandTestCase(TestBase):
         self.expect("settings show",
             startstr = "term-width (int) = '70'")
 
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    def test_with_dsym(self):
+        """Test that run-args and env-vars are passed to the launched process."""
+        self.buildDsym()
+        self.pass_run_args_and_env_vars()
+
+    def test_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()
+
+    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.
+        self.runCmd('settings set process.run-args A B C')
+        self.runCmd('settings set process.env-vars ["MY_ENV_VAR"]=YES')
+
+        self.runCmd("run", RUN_SUCCEEDED)
+
+        # Read the output file produced by running the program.
+        output = open('/tmp/output.txt', 'r').read()
+
+        self.assertTrue(output.startswith("argv[1] matches") and
+                        output.find("argv[2] matches") > 0 and
+                        output.find("argv[3] matches") > 0 and
+                        output.find("Environment variable 'MY_ENV_VAR' successfully passed.") > 0)
+
 
 if __name__ == '__main__':
     import atexit
diff --git a/lldb/test/settings/main.cpp b/lldb/test/settings/main.cpp
new file mode 100644
index 00000000000..b2acd64cb22
--- /dev/null
+++ b/lldb/test/settings/main.cpp
@@ -0,0 +1,44 @@
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <cstdlib>
+#include <string>
+#include <fstream>
+
+int
+main(int argc, char const *argv[])
+{
+    char const *cptr = NULL;
+    // The program writes its output to the "output.txt" file.
+    std::ofstream outfile("output.txt");
+
+    for (unsigned i = 0, e = sizeof(argv); i < e; ++i) {
+        if ((cptr = argv[i]) == NULL)
+            break;
+
+        std::string str(cptr);
+        if (i == 1 && "A" == str)
+            outfile << "argv[1] matches\n";
+
+        if (i == 2 && "B" == str)
+            outfile << "argv[2] matches\n";
+
+        if (i == 3 && "C" == str)
+            outfile << "argv[3] matches\n";
+    }
+
+    if (::getenv("MY_ENV_VAR")) {
+        std::string MY_ENV_VAR(getenv("MY_ENV_VAR"));
+        if ("YES" == MY_ENV_VAR) {
+            outfile << "Environment variable 'MY_ENV_VAR' successfully passed.\n";
+        }
+    }
+
+    return 0;
+}