3 files changed, 53 insertions, 0 deletions
diff --git a/lldb/test/Shell/Process/Inputs/env.cpp b/lldb/test/Shell/Process/Inputs/env.cpp
new file mode 100644
index 00000000000..cbf671ccd2f
--- /dev/null
+++ b/lldb/test/Shell/Process/Inputs/env.cpp
@@ -0,0 +1,7 @@
+#include <cstdlib>
+#include <iostream>
+
+int main() {
+  if (const char *env_p = std::getenv("FOO"))
+    std::cout << "FOO=" << env_p << '\n';
+}
diff --git a/lldb/test/Shell/Process/TestEnvironment.test b/lldb/test/Shell/Process/TestEnvironment.test
new file mode 100644
index 00000000000..355feb306cd
--- /dev/null
+++ b/lldb/test/Shell/Process/TestEnvironment.test
@@ -0,0 +1,9 @@
+UNSUPPORTED: system-windows
+
+The double quotes around "BAR" ensure we don't match the command.
+
+RUN: %clangxx -std=c++11 %p/Inputs/env.cpp -o %t
+RUN: %lldb %t -o 'process launch --environment FOO="BAR"' | FileCheck %s
+RUN: %lldb %t -o 'env FOO="BAR"' -o 'process launch' | FileCheck %s
+
+CHECK: FOO=BAR
diff --git a/lldb/test/Shell/Process/Windows/exception_access_violation.cpp b/lldb/test/Shell/Process/Windows/exception_access_violation.cpp
new file mode 100644
index 00000000000..4835b498ee4
--- /dev/null
+++ b/lldb/test/Shell/Process/Windows/exception_access_violation.cpp
@@ -0,0 +1,37 @@
+// clang-format off
+
+// REQUIRES: system-windows
+// RUN: %build --compiler=clang-cl -o %t.exe -- %s
+// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -o "run" -- write | FileCheck --check-prefix=WRITE %s
+// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -o "run" -- read | FileCheck --check-prefix=READ %s
+
+#include <string.h>
+
+int access_violation_write(void* addr) {
+    *(int*)addr = 42;
+    return 0;
+}
+
+
+int access_violation_read(void* addr) {
+    volatile int ret = *(int*)addr;
+    return ret;
+}
+
+int main(int argc, char *argv[]) {
+    if (argc < 2) {
+        return 1;
+    }
+    if (strcmp(argv[1], "write") == 0) {
+        return access_violation_write((void*)42);
+    }
+    if (strcmp(argv[1], "read") == 0) {
+        return access_violation_read((void*)42);
+    }
+    return 1;
+}
+
+
+// WRITE:     * thread #1, stop reason = Exception 0xc0000005 encountered at address {{.*}}: Access violation writing location 0x0000002a
+
+// READ:      * thread #1, stop reason = Exception 0xc0000005 encountered at address {{.*}}: Access violation reading location 0x0000002a