[debuginfo-tests] Remove explicit checks for Python 3
LLVM has a minimum requirement of python 3.6 now, and Python is
explicitly checked for in the LLVM CMakeLists.txt, so this check is no
longer needed here.
Differential Revision: https://reviews.llvm.org/D96499
Reviewed by: aprantl
GitOrigin-RevId: 6c330f0df8da7f6b94f511fc3f5573003fdda093
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0abbe46..0b01202 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,10 +54,6 @@
set(DEBUGINFO_TEST_DEPS ${DEBUGINFO_TEST_DEPS} lld)
endif()
-if (NOT DEFINED Python3_EXECUTABLE)
- message(FATAL_ERROR "Cannot run debuginfo-tests without python 3")
-endif()
-
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
diff --git a/lit.cfg.py b/lit.cfg.py
index bcf31c9..da6cb9b 100644
--- a/lit.cfg.py
+++ b/lit.cfg.py
@@ -102,14 +102,14 @@
# for running a test.
dexter_path = os.path.join(config.debuginfo_tests_src_root,
'dexter', 'dexter.py')
-dexter_test_cmd = '"{}" "{}" test'.format(config.python3_executable, dexter_path)
+dexter_test_cmd = '"{}" "{}" test'.format(sys.executable, dexter_path)
if lldb_path is not None:
dexter_test_cmd += ' --lldb-executable "{}"'.format(lldb_path)
tools.append(ToolSubst('%dexter', dexter_test_cmd))
# For testing other bits of dexter that aren't under the "test" subcommand,
# have a %dexter_base substitution.
-dexter_base_cmd = '"{}" "{}"'.format(config.python3_executable, dexter_path)
+dexter_base_cmd = '"{}" "{}"'.format(sys.executable, dexter_path)
tools.append(ToolSubst('%dexter_base', dexter_base_cmd))
# Set up commands for DexTer regression tests.
@@ -129,8 +129,8 @@
# Typical command would take the form:
# ./path_to_py/python.exe ./path_to_dex/dexter.py test --fail-lt 1.0 -w --builder clang --debugger lldb --cflags '-O0 -g'
dexter_regression_test_command = ' '.join(
- # "python3", "dexter.py", test, fail_mode, builder, debugger, cflags, ldflags
- ['"{}"'.format(config.python3_executable),
+ # "python", "dexter.py", test, fail_mode, builder, debugger, cflags, ldflags
+ ['"{}"'.format(sys.executable),
'"{}"'.format(dexter_path),
'test',
'--fail-lt 1.0 -w',
diff --git a/lit.site.cfg.py.in b/lit.site.cfg.py.in
index 4ed49b8..4f463f4 100644
--- a/lit.site.cfg.py.in
+++ b/lit.site.cfg.py.in
@@ -24,8 +24,6 @@
config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
-config.python3_executable = "@Python3_EXECUTABLE@"
-
# Support substitution of the tools_dir with user parameters. This is
# used when we can't determine the tool dir at configuration time.
try:
