Author: Jonas Devlieghere Date: 2020-01-22T13:24:12-08:00 New Revision: 536612df4b499c7338719ab8a31973f086bff590
URL: https://github.com/llvm/llvm-project/commit/536612df4b499c7338719ab8a31973f086bff590 DIFF: https://github.com/llvm/llvm-project/commit/536612df4b499c7338719ab8a31973f086bff590.diff LOG: [lldb/Test] Use lit's capabilities to skip lldb-repro tests. This allows us to skip the reproducer tests themselves as a whole as well as individual tests with the UNSUPPORTED keyword. Added: Modified: lldb/test/Shell/Process/TestEnvironment.test lldb/test/Shell/Quit/TestQuitExitCode-30.test lldb/test/Shell/Quit/TestQuitExitCode30.test lldb/test/Shell/Quit/TestQuitExitCodeHexA.test lldb/test/Shell/Reproducer/lit.local.cfg lldb/test/Shell/lit.cfg.py Removed: ################################################################################ diff --git a/lldb/test/Shell/Process/TestEnvironment.test b/lldb/test/Shell/Process/TestEnvironment.test index a9c624b8a4ec..e6d6e56fc920 100644 --- a/lldb/test/Shell/Process/TestEnvironment.test +++ b/lldb/test/Shell/Process/TestEnvironment.test @@ -1,4 +1,5 @@ UNSUPPORTED: system-windows +UNSUPPORTED: lldb-repro The double quotes around "BAR" ensure we don't match the command. diff --git a/lldb/test/Shell/Quit/TestQuitExitCode-30.test b/lldb/test/Shell/Quit/TestQuitExitCode-30.test index 2f15398c7614..b0b02bdf7004 100644 --- a/lldb/test/Shell/Quit/TestQuitExitCode-30.test +++ b/lldb/test/Shell/Quit/TestQuitExitCode-30.test @@ -1,3 +1,4 @@ # UNSUPPORTED: system-windows +# UNSUPPORTED: lldb-repro # RUN: %python %S/expect_exit_code.py 226 %lldb -b -s %s q -30 diff --git a/lldb/test/Shell/Quit/TestQuitExitCode30.test b/lldb/test/Shell/Quit/TestQuitExitCode30.test index e5ff634e7136..92ad3c6d1fe4 100644 --- a/lldb/test/Shell/Quit/TestQuitExitCode30.test +++ b/lldb/test/Shell/Quit/TestQuitExitCode30.test @@ -1,3 +1,4 @@ # UNSUPPORTED: system-windows +# UNSUPPORTED: lldb-repro # RUN: %python %S/expect_exit_code.py 30 %lldb -b -s %s q 30 diff --git a/lldb/test/Shell/Quit/TestQuitExitCodeHexA.test b/lldb/test/Shell/Quit/TestQuitExitCodeHexA.test index ca0e2d5acc3b..59b7103ad086 100644 --- a/lldb/test/Shell/Quit/TestQuitExitCodeHexA.test +++ b/lldb/test/Shell/Quit/TestQuitExitCodeHexA.test @@ -1,3 +1,4 @@ # UNSUPPORTED: system-windows +# UNSUPPORTED: lldb-repro # RUN: %python %S/expect_exit_code.py 10 %lldb -b -s %s q 0xA diff --git a/lldb/test/Shell/Reproducer/lit.local.cfg b/lldb/test/Shell/Reproducer/lit.local.cfg index f40d81c38099..7f4022768c87 100644 --- a/lldb/test/Shell/Reproducer/lit.local.cfg +++ b/lldb/test/Shell/Reproducer/lit.local.cfg @@ -6,5 +6,5 @@ if 'LLVM_DISABLE_CRASH_REPORT' in config.environment: if 'LLDB_CAPTURE_REPRODUCER' in config.environment: del config.environment['LLDB_CAPTURE_REPRODUCER'] -if hasattr(config, 'skip_reproducer_test') and config.skip_reproducer_test: +if 'lldb-repro' in config.available_features: config.unsupported = True diff --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py index 271ca7b2a138..3bda378060af 100644 --- a/lldb/test/Shell/lit.cfg.py +++ b/lldb/test/Shell/lit.cfg.py @@ -48,7 +48,7 @@ # just captured reproducer. lldb_repro_mode = lit_config.params.get('lldb-run-with-repro', None) if lldb_repro_mode: - config.skip_reproducer_test = True + config.available_features.add('lldb-repro') lit_config.note("Running Shell test with lldb-repo in {} mode.".format(lldb_repro_mode)) toolchain.use_lldb_repro_substitutions(config, lldb_repro_mode) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
