Author: teemperor Date: Fri Jul 19 08:55:23 2019 New Revision: 366590 URL: http://llvm.org/viewvc/llvm-project?rev=366590&view=rev Log: [lldb][NFC] Cleanup mentions and code related to lldb-mi
Summary: lldb-mi has been removed, but there are still a bunch of references in the code base. This patch removes all of them. Reviewers: JDevlieghere, jfb Reviewed By: JDevlieghere Subscribers: dexonsmith, ki.stfu, mgorny, abidh, jfb, lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D64992 Removed: lldb/trunk/packages/Python/lldbsuite/test/tools/ Modified: lldb/trunk/CMakeLists.txt lldb/trunk/CODE_OWNERS.txt lldb/trunk/lit/helper/toolchain.py lldb/trunk/packages/Python/lldbsuite/test/dotest.py lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py lldb/trunk/packages/Python/lldbsuite/test/test_categories.py Modified: lldb/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=366590&r1=366589&r2=366590&view=diff ============================================================================== --- lldb/trunk/CMakeLists.txt (original) +++ lldb/trunk/CMakeLists.txt Fri Jul 19 08:55:23 2019 @@ -106,10 +106,6 @@ if(LLDB_INCLUDE_TESTS) list(APPEND LLDB_TEST_DEPS lldb-server) endif() - if(TARGET lldb-mi) - list(APPEND LLDB_TEST_DEPS lldb-mi) - endif() - if(TARGET lldb-vscode) list(APPEND LLDB_TEST_DEPS lldb-vscode) endif() Modified: lldb/trunk/CODE_OWNERS.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CODE_OWNERS.txt?rev=366590&r1=366589&r2=366590&view=diff ============================================================================== --- lldb/trunk/CODE_OWNERS.txt (original) +++ lldb/trunk/CODE_OWNERS.txt Fri Jul 19 08:55:23 2019 @@ -21,10 +21,6 @@ D: Watchpoints, Trampolines, Target, Com D: Expression evaluator, IR interpreter, Clang integration D: Data Formatters -N: Ilia K -E: ki.s...@gmail.com -D: lldb-mi - N: Ed Maste E: ema...@freebsd.org D: FreeBSD @@ -34,10 +30,6 @@ E: jmole...@apple.com D: ABI, Disassembler, Unwinding, iOS, debugserver, Platform, ObjectFile, SymbolFile, D: SymbolVendor, DWARF, gdb-remote -N: Hafiz Abid Qadeer -E: abidh....@gmail.com -D: lldb-mi - N: Kamil Rytarowski E: ka...@netbsd.org D: NetBSD Modified: lldb/trunk/lit/helper/toolchain.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/helper/toolchain.py?rev=366590&r1=366589&r2=366590&view=diff ============================================================================== --- lldb/trunk/lit/helper/toolchain.py (original) +++ lldb/trunk/lit/helper/toolchain.py Fri Jul 19 08:55:23 2019 @@ -16,11 +16,6 @@ def use_lldb_substitutions(config): dsname = 'debugserver' if platform.system() in ['Darwin'] else 'lldb-server' dsargs = [] if platform.system() in ['Darwin'] else ['gdbserver'] - lldbmi = ToolSubst('%lldbmi', - command=FindTool('lldb-mi'), - extra_args=['--synchronous'], - unresolved='ignore') - build_script = os.path.dirname(__file__) build_script = os.path.join(build_script, 'build.py') @@ -43,7 +38,6 @@ def use_lldb_substitutions(config): ToolSubst('%lldb-init', command=FindTool('lldb'), extra_args=['-S', lldb_init]), - lldbmi, ToolSubst('%debugserver', command=FindTool(dsname), extra_args=dsargs, @@ -61,9 +55,6 @@ def use_lldb_substitutions(config): llvm_config.add_tool_substitutions(primary_tools, [config.lldb_tools_dir]) - # lldb-mi always fails without Python support - if lldbmi.was_resolved and not config.lldb_disable_python: - config.available_features.add('lldb-mi') def _use_msvc_substitutions(config): # If running from a Visual Studio Command prompt (e.g. vcvars), this will Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=366590&r1=366589&r2=366590&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original) +++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Fri Jul 19 08:55:23 2019 @@ -693,16 +693,11 @@ def setupSysPath(): os.environ["LLDB_SRC"] = lldbsuite.lldb_root pluginPath = os.path.join(scriptPath, 'plugins') - toolsLLDBMIPath = os.path.join(scriptPath, 'tools', 'lldb-mi') toolsLLDBVSCode = os.path.join(scriptPath, 'tools', 'lldb-vscode') toolsLLDBServerPath = os.path.join(scriptPath, 'tools', 'lldb-server') - # Insert script dir, plugin dir, lldb-mi dir and lldb-server dir to the - # sys.path. + # Insert script dir, plugin dir and lldb-server dir to the sys.path. sys.path.insert(0, pluginPath) - # Adding test/tools/lldb-mi to the path makes it easy - sys.path.insert(0, toolsLLDBMIPath) - # to "import lldbmi_testcase" from the MI tests # Adding test/tools/lldb-vscode to the path makes it easy to # "import lldb_vscode_testcase" from the VSCode tests sys.path.insert(0, toolsLLDBVSCode) @@ -761,19 +756,7 @@ def setupSysPath(): print("LLDB import library dir:", os.environ["LLDB_IMPLIB_DIR"]) os.system('%s -v' % lldbtest_config.lldbExec) - # Assume lldb-mi is in same place as lldb - # If not found, disable the lldb-mi tests - # TODO: Append .exe on Windows - # - this will be in a separate commit in case the mi tests fail horribly lldbDir = os.path.dirname(lldbtest_config.lldbExec) - lldbMiExec = os.path.join(lldbDir, "lldb-mi") - if is_exe(lldbMiExec): - os.environ["LLDBMI_EXEC"] = lldbMiExec - else: - if not configuration.shouldSkipBecauseOfCategories(["lldb-mi"]): - print( - "The 'lldb-mi' executable cannot be located. The lldb-mi tests can not be run as a result.") - configuration.skipCategories.append("lldb-mi") lldbVSCodeExec = os.path.join(lldbDir, "lldb-vscode") if is_exe(lldbVSCodeExec): Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=366590&r1=366589&r2=366590&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original) +++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Fri Jul 19 08:55:23 2019 @@ -711,11 +711,6 @@ class Base(unittest2.TestCase): else: self.libcxxPath = None - if "LLDBMI_EXEC" in os.environ: - self.lldbMiExec = os.environ["LLDBMI_EXEC"] - else: - self.lldbMiExec = None - if "LLDBVSCODE_EXEC" in os.environ: self.lldbVSCodeExec = os.environ["LLDBVSCODE_EXEC"] else: Modified: lldb/trunk/packages/Python/lldbsuite/test/test_categories.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/test_categories.py?rev=366590&r1=366589&r2=366590&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/test_categories.py (original) +++ lldb/trunk/packages/Python/lldbsuite/test/test_categories.py Fri Jul 19 08:55:23 2019 @@ -34,7 +34,6 @@ all_categories = { 'dyntype': 'Tests related to dynamic type support', 'stresstest': 'Tests related to stressing lldb limits', 'flakey': 'Flakey test cases, i.e. tests that do not reliably pass at each execution', - 'lldb-mi': 'lldb-mi tests', 'darwin-log': 'Darwin log tests', 'watchpoint': 'Watchpoint-related tests', } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits