Skip to content

Commit a834076

Browse files
authored
[lldb] Remove cmake check for pexpect with LLDB_TEST_USE_VENDOR_PACKAGES (#86962)
The commit 8bed754 was intended to support the use case where users want to run all the LLDB tests in an environment where pexpect is not installed. Those users can build with `-DLLDB_TEST_USER_ARGS=--skip-category=pexpect` to skip pexpect tests, *but* because we still fail in cmake configuration, they must use `-DLLDB_TEST_USE_VENDOR_PACKAGES=ON` to avoid failing due to pexpect not being available. I would like to remove `LLDB_TEST_USE_VENDOR_PACKAGES` now, but first I'd like to make sure users w/o pexpect can pass CI with `-DLLDB_TEST_USE_VENDOR_PACKAGES=OFF -DLLDB_TEST_USER_ARGS=--skip-category=pexpect`. Once that is done, I am not aware of any other issues caused by the previous commits, so the third party tree should be safe to remove.
1 parent 7c1c07c commit a834076

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

lldb/test/CMakeLists.txt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,6 @@ if(LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS)
3131
endforeach()
3232
endif()
3333

34-
# The "pexpect" package should come from the system environment, not from the
35-
# LLDB tree. However, we delay the deletion of it from the tree in case
36-
# users/buildbots don't have the package yet and need some time to install it.
37-
# Windows is configured to skip all pexpect tests, and guards all
38-
# "import pexpect" calls, so we do not need pexpect installed there.
39-
if (NOT LLDB_TEST_USE_VENDOR_PACKAGES AND NOT WIN32)
40-
unset(PY_pexpect_FOUND CACHE)
41-
lldb_find_python_module(pexpect)
42-
if (NOT PY_pexpect_FOUND)
43-
message(FATAL_ERROR
44-
"Python module 'pexpect' not found. Please install it via pip or via "
45-
"your operating system's package manager. For a temporary workaround, "
46-
"use a version from the LLDB tree with "
47-
"`LLDB_TEST_USE_VENDOR_PACKAGES=ON`")
48-
endif()
49-
endif()
50-
5134
if(LLDB_BUILT_STANDALONE)
5235
# In order to run check-lldb-* we need the correct map_config directives in
5336
# llvm-lit. Because this is a standalone build, LLVM doesn't know about LLDB,

0 commit comments

Comments
 (0)