Author: Jonas Devlieghere Date: 2021-03-31T21:42:00-07:00 New Revision: d1828937ed8d79a772ec60a8f3c7f4a873f581d4
URL: https://github.com/llvm/llvm-project/commit/d1828937ed8d79a772ec60a8f3c7f4a873f581d4 DIFF: https://github.com/llvm/llvm-project/commit/d1828937ed8d79a772ec60a8f3c7f4a873f581d4.diff LOG: [lldb] Remove references to LLDB_CAPTURE_REPRODUCER Remove the remaining references to LLDB_CAPTURE_REPRODUCER. I removed the functionality in an earlier commit but forgot that there was a corresponding test and logic to unset it in our test suite. Added: Modified: lldb/docs/design/reproducers.rst lldb/test/API/lit.cfg.py lldb/test/Shell/Reproducer/lit.local.cfg lldb/test/Shell/lit.cfg.py Removed: lldb/test/Shell/Reproducer/TestCaptureEnvOverride.test ################################################################################ diff --git a/lldb/docs/design/reproducers.rst b/lldb/docs/design/reproducers.rst index d8ad3dd7866d4..99e34d812deed 100644 --- a/lldb/docs/design/reproducers.rst +++ b/lldb/docs/design/reproducers.rst @@ -182,13 +182,6 @@ Reproducers are tested in the following ways: unsupported by adding ``UNSUPPORTED: lldb-repro`` to the top of the shell test or adding the ``skipIfReproducer`` decorator for the API tests. -Additional testing is possible: - - - It's possible to unconditionally capture reproducers while running the - entire test suite by setting the ``LLDB_CAPTURE_REPRODUCER`` environment - variable. Assuming no bugs in reproducers, this can also help to reproduce - and investigate test failures. - Knows Issues ------------ diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py index cbb457e9328c6..9f63dc144a07e 100644 --- a/lldb/test/API/lit.cfg.py +++ b/lldb/test/API/lit.cfg.py @@ -252,11 +252,6 @@ def delete_module_cache(path): config.environment['FREEBSD_LEGACY_PLUGIN'] = os.environ[ 'FREEBSD_LEGACY_PLUGIN'] -# Propagate LLDB_CAPTURE_REPRODUCER -if 'LLDB_CAPTURE_REPRODUCER' in os.environ: - config.environment['LLDB_CAPTURE_REPRODUCER'] = os.environ[ - 'LLDB_CAPTURE_REPRODUCER'] - # Propagate XDG_CACHE_HOME if 'XDG_CACHE_HOME' in os.environ: config.environment['XDG_CACHE_HOME'] = os.environ['XDG_CACHE_HOME'] diff --git a/lldb/test/Shell/Reproducer/TestCaptureEnvOverride.test b/lldb/test/Shell/Reproducer/TestCaptureEnvOverride.test deleted file mode 100644 index 122a05980aa79..0000000000000 --- a/lldb/test/Shell/Reproducer/TestCaptureEnvOverride.test +++ /dev/null @@ -1,17 +0,0 @@ -# This tests the LLDB_CAPTURE_REPRODUCER override. - -# RUN: %lldb -b -o 'reproducer status' --capture --capture-path %t.repro /bin/ls | FileCheck %s --check-prefix CAPTURE -# RUN: %lldb -b -o 'reproducer status' --capture | FileCheck %s --check-prefix CAPTURE - -# RUN: LLDB_CAPTURE_REPRODUCER=1 %lldb -b -o 'reproducer status' | FileCheck %s --check-prefix CAPTURE -# RUN: LLDB_CAPTURE_REPRODUCER=ON %lldb -b -o 'reproducer status' | FileCheck %s --check-prefix CAPTURE -# RUN: LLDB_CAPTURE_REPRODUCER=on %lldb -b -o 'reproducer status' | FileCheck %s --check-prefix CAPTURE - -# RUN: LLDB_CAPTURE_REPRODUCER=0 %lldb -b -o 'reproducer status' --capture --capture-path %t.repro | FileCheck %s --check-prefix OFF -# RUN: LLDB_CAPTURE_REPRODUCER=0 %lldb -b -o 'reproducer status' --capture | FileCheck %s --check-prefix OFF - -# RUN: LLDB_CAPTURE_REPRODUCER=bogus %lldb -b -o 'reproducer status' --capture | FileCheck %s --check-prefix CAPTURE -# RUN: LLDB_CAPTURE_REPRODUCER=bogus %lldb -b -o 'reproducer status' | FileCheck %s --check-prefix OFF - -# CAPTURE: Reproducer is in capture mode. -# OFF: Reproducer is off. diff --git a/lldb/test/Shell/Reproducer/lit.local.cfg b/lldb/test/Shell/Reproducer/lit.local.cfg index 30f97f28279d4..9de095f189f56 100644 --- a/lldb/test/Shell/Reproducer/lit.local.cfg +++ b/lldb/test/Shell/Reproducer/lit.local.cfg @@ -2,10 +2,6 @@ if 'LLVM_DISABLE_CRASH_REPORT' in config.environment: del config.environment['LLVM_DISABLE_CRASH_REPORT'] -# Unset the always capture environment override. -if 'LLDB_CAPTURE_REPRODUCER' in config.environment: - del config.environment['LLDB_CAPTURE_REPRODUCER'] - if 'system-windows' in config.available_features: config.unsupported = True diff --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py index c4730b284b23c..964efc8c3505f 100644 --- a/lldb/test/Shell/lit.cfg.py +++ b/lldb/test/Shell/lit.cfg.py @@ -42,7 +42,6 @@ llvm_config.with_system_environment([ 'FREEBSD_LEGACY_PLUGIN', 'HOME', - 'LLDB_CAPTURE_REPRODUCER', 'TEMP', 'TMP', 'XDG_CACHE_HOME', _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
