Skip to content

[libc++] Simplify how we select modules flavors in the test suite #66385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2023
Merged

[libc++] Simplify how we select modules flavors in the test suite #66385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libcxx/cmake/caches/Generic-modules-lsv.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
set(LIBCXX_TEST_PARAMS "enable_modules=clang;enable_modules_lsv=True" CACHE STRING "")
set(LIBCXX_TEST_PARAMS "enable_modules=clang-lsv" CACHE STRING "")
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")
46 changes: 15 additions & 31 deletions libcxx/utils/libcxx/test/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,6 @@ def getStdFlag(cfg, std):
return None


_allModules = ["none", "clang"]


def getModuleFlag(cfg, enable_modules):
if enable_modules in _allModules:
return enable_modules
return None


# fmt: off
DEFAULT_PARAMETERS = [
Parameter(
Expand Down Expand Up @@ -128,32 +119,25 @@ def getModuleFlag(cfg, enable_modules):
),
Parameter(
name="enable_modules",
choices=_allModules,
choices=["none", "clang", "clang-lsv"],
type=str,
help="Whether to build the test suite with modules enabled. Select "
"`clang` for Clang modules",
default=lambda cfg: next(s for s in _allModules if getModuleFlag(cfg, s)),
actions=lambda enable_modules: [
AddFeature("clang-modules-build"),
AddCompileFlag("-fmodules"),
AddCompileFlag("-fcxx-modules"), # AppleClang disregards -fmodules entirely when compiling C++. This enables modules for C++.
help="Whether to build the test suite with modules enabled. "
"Select `clang` for Clang modules, and 'clang-lsv' for Clang modules with Local Submodule Visibility.",
default="none",
actions=lambda modules: filter(None, [
AddFeature("clang-modules-build") if modules in ("clang", "clang-lsv") else None,

# Note: AppleClang disregards -fmodules entirely when compiling C++, so we also pass -fcxx-modules
# to enable modules for C++.
AddCompileFlag("-fmodules -fcxx-modules") if modules in ("clang", "clang-lsv") else None,

# Note: We use a custom modules cache path to make sure that we don't reuse
# the default one, which can be shared across CI builds with different
# configurations.
AddCompileFlag(lambda cfg: f"-fmodules-cache-path={cfg.test_exec_root}/ModuleCache"),
]
if enable_modules == "clang"
else [],
),
Parameter(
name="enable_modules_lsv",
choices=[True, False],
type=bool,
default=False,
help="Whether to enable Local Submodule Visibility in the Modules build.",
actions=lambda lsv: [] if not lsv else [
AddCompileFlag("-Xclang -fmodules-local-submodule-visibility"),
],
AddCompileFlag(lambda cfg: f"-fmodules-cache-path={cfg.test_exec_root}/ModuleCache") if modules in ("clang", "clang-lsv") else None,

AddCompileFlag("-Xclang -fmodules-local-submodule-visibility") if modules == "clang-lsv" else None,
])
),
Parameter(
name="enable_exceptions",
Expand Down