[Dexter] Replace clang with clang++ in various cross project tests (#65987)
This patch replaces invocations of clang with clang++ for a set of
c++ files in the dexter cross-project tests. As a small additional change,
this patch removes -lstdc++ from a test that did not appear to require it.
diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py
index ccd3d01..b35c643 100644
--- a/cross-project-tests/lit.cfg.py
+++ b/cross-project-tests/lit.cfg.py
@@ -131,18 +131,31 @@
if platform.system() == "Windows":
# The Windows builder script uses lld.
dependencies = ["clang", "lld-link"]
- dexter_regression_test_builder = "clang-cl"
+ dexter_regression_test_c_builder = "clang-cl"
+ dexter_regression_test_cxx_builder = "clang-cl"
dexter_regression_test_debugger = "dbgeng"
- dexter_regression_test_flags = "/Zi /Od"
+ dexter_regression_test_c_flags = "/Zi /Od"
+ dexter_regression_test_cxx_flags = "/Zi /Od"
+ dexter_regression_test_additional_flags = ""
else:
# Use lldb as the debugger on non-Windows platforms.
dependencies = ["clang", "lldb"]
- dexter_regression_test_builder = "clang++"
+ dexter_regression_test_c_builder = "clang"
+ dexter_regression_test_cxx_builder = "clang++"
dexter_regression_test_debugger = "lldb"
- dexter_regression_test_flags = "-O0 -glldb -std=gnu++11"
+ dexter_regression_test_c_flags = "-O0 -glldb -std=gnu11"
+ dexter_regression_test_cxx_flags = "-O0 -glldb -std=gnu++11"
+ dexter_regression_test_additional_flags = '--lldb-executable "{}"'.format(
+ lldb_path
+ )
tools.append(
- ToolSubst("%dexter_regression_test_builder", dexter_regression_test_builder)
+ ToolSubst("%dexter_regression_test_c_builder", dexter_regression_test_c_builder)
+ )
+ tools.append(
+ ToolSubst(
+ "%dexter_regression_test_cxx_builder", dexter_regression_test_cxx_builder
+ )
)
tools.append(
ToolSubst("%dexter_regression_test_debugger", dexter_regression_test_debugger)
@@ -151,7 +164,10 @@
# regression tests we use clang to drive the linker, and so all flags will be
# passed in a single command.
tools.append(
- ToolSubst("%dexter_regression_test_flags", dexter_regression_test_flags)
+ ToolSubst("%dexter_regression_test_c_flags", dexter_regression_test_c_flags)
+ )
+ tools.append(
+ ToolSubst("%dexter_regression_test_cxx_flags", dexter_regression_test_cxx_flags)
)
# Typical command would take the form:
@@ -165,18 +181,30 @@
"--fail-lt 1.0 -w",
"--debugger",
dexter_regression_test_debugger,
+ dexter_regression_test_additional_flags,
]
)
tools.append(ToolSubst("%dexter_regression_test_run", dexter_regression_test_run))
# Include build flags for %dexter_regression_test.
- dexter_regression_test_build = " ".join(
+ dexter_regression_test_c_build = " ".join(
[
- dexter_regression_test_builder,
- dexter_regression_test_flags,
+ dexter_regression_test_c_builder,
+ dexter_regression_test_c_flags,
]
)
- tools.append(ToolSubst("%dexter_regression_test_build", dexter_regression_test_build))
+ dexter_regression_test_cxx_build = " ".join(
+ [
+ dexter_regression_test_cxx_builder,
+ dexter_regression_test_cxx_flags,
+ ]
+ )
+ tools.append(
+ ToolSubst("%dexter_regression_test_c_build", dexter_regression_test_c_build)
+ )
+ tools.append(
+ ToolSubst("%dexter_regression_test_cxx_build", dexter_regression_test_cxx_build)
+ )
return dependencies
