summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2019-12-04 16:43:19 -0800
committerJonas Devlieghere <jonas@devlieghere.com>2019-12-04 16:49:11 -0800
commitacda2bc0adf62d9e54bf6d284f91e6cfa5b3cc6e (patch)
treee6bb6d5f07b82673cbeace361f845570c8eef931
parentdfe9a7943bf7a926e51b319a2c2f73e4b4b4cf43 (diff)
downloadbcm5719-llvm-acda2bc0adf62d9e54bf6d284f91e6cfa5b3cc6e.tar.gz
bcm5719-llvm-acda2bc0adf62d9e54bf6d284f91e6cfa5b3cc6e.zip
[lldb/Reproducers] Propagate LLDB_CAPTURE_REPRODUCER to the test suite
-rw-r--r--lldb/test/API/lit.cfg.py5
-rw-r--r--lldb/test/Shell/Reproducer/lit.local.cfg7
-rw-r--r--lldb/test/Shell/lit.cfg.py4
3 files changed, 14 insertions, 2 deletions
diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py
index 06125a1aaed..9b1c3c12f17 100644
--- a/lldb/test/API/lit.cfg.py
+++ b/lldb/test/API/lit.cfg.py
@@ -54,6 +54,11 @@ if config.shared_libs:
lit_config.warning("unable to inject shared library path on '{}'".format(
platform.system()))
+# Propagate LLDB_CAPTURE_REPRODUCER
+if 'LLDB_CAPTURE_REPRODUCER' in os.environ:
+ config.environment['LLDB_CAPTURE_REPRODUCER'] = os.environ[
+ 'LLDB_CAPTURE_REPRODUCER']
+
# Clean the module caches in the test build directory. This is necessary in an
# incremental build whenever clang changes underneath, so doing it once per
# lit.py invocation is close enough.
diff --git a/lldb/test/Shell/Reproducer/lit.local.cfg b/lldb/test/Shell/Reproducer/lit.local.cfg
index 7386b8655d1..dbb37b199d7 100644
--- a/lldb/test/Shell/Reproducer/lit.local.cfg
+++ b/lldb/test/Shell/Reproducer/lit.local.cfg
@@ -1,3 +1,6 @@
# Enable crash reports for the reproducer tests.
-del config.environment['LLVM_DISABLE_CRASH_REPORT']
-del config.environment['LLDB_CAPTURE_REPRODUCER']
+if 'LLVM_DISABLE_CRASH_REPORT' in config.environment:
+ del config.environment['LLVM_DISABLE_CRASH_REPORT']
+
+if 'LLDB_CAPTURE_REPRODUCER' in config.environment:
+ del config.environment['LLDB_CAPTURE_REPRODUCER']
diff --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py
index 84c5b730dd3..68891e60016 100644
--- a/lldb/test/Shell/lit.cfg.py
+++ b/lldb/test/Shell/lit.cfg.py
@@ -38,6 +38,10 @@ config.test_source_root = os.path.dirname(__file__)
# test_exec_root: The root path where tests should be run.
config.test_exec_root = os.path.join(config.lldb_obj_root, 'test')
+# Propagate LLDB_CAPTURE_REPRODUCER
+if 'LLDB_CAPTURE_REPRODUCER' in os.environ:
+ config.environment['LLDB_CAPTURE_REPRODUCER'] = os.environ[
+ 'LLDB_CAPTURE_REPRODUCER']
llvm_config.use_default_substitutions()
toolchain.use_lldb_substitutions(config)
OpenPOWER on IntegriCloud