diff options
| author | Louis Dionne <ldionne.2@gmail.com> | 2024-05-28 18:29:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 18:29:47 -0700 |
| commit | 633ea41b54bf7b2f10850bbd5ba3c4ab06081595 (patch) | |
| tree | 72dbe1af28ed588070d443aa6da9fe6f38c3e15f /libcxxabi | |
| parent | 04f01a2b9cedc291fa7dd941de841dc957c75a33 (diff) | |
| download | llvm-633ea41b54bf7b2f10850bbd5ba3c4ab06081595.zip llvm-633ea41b54bf7b2f10850bbd5ba3c4ab06081595.tar.gz llvm-633ea41b54bf7b2f10850bbd5ba3c4ab06081595.tar.bz2 | |
[runtimes] Reintroduce a way to select the compiler used for the test suite (#93542)
A while back, the cxx_under_test Lit parameter was removed. This patch
reintroduces a Lit parameter called "compiler" which controls the value
of the %{cxx} substitution used in the test suite.
To run the test suite with a different compiler, one can now pass
--param compiler=<path>.
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libcxxabi/test/configs/cmake-bridge.cfg.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libcxxabi/test/CMakeLists.txt b/libcxxabi/test/CMakeLists.txt index 5869271..cd908a3 100644 --- a/libcxxabi/test/CMakeLists.txt +++ b/libcxxabi/test/CMakeLists.txt @@ -24,6 +24,8 @@ endif() set(AUTO_GEN_COMMENT "## Autogenerated by libcxxabi configuration.\n# Do not edit!") set(SERIALIZED_LIT_PARAMS "# Lit parameters serialized here for llvm-lit to pick them up\n") +serialize_lit_string_param(SERIALIZED_LIT_PARAMS compiler "${CMAKE_CXX_COMPILER}") + if (NOT LIBCXXABI_ENABLE_EXCEPTIONS) serialize_lit_param(SERIALIZED_LIT_PARAMS enable_exceptions False) endif() diff --git a/libcxxabi/test/configs/cmake-bridge.cfg.in b/libcxxabi/test/configs/cmake-bridge.cfg.in index 1d0f51d..3fefc6a 100644 --- a/libcxxabi/test/configs/cmake-bridge.cfg.in +++ b/libcxxabi/test/configs/cmake-bridge.cfg.in @@ -26,7 +26,6 @@ config.test_exec_root = os.path.join('@CMAKE_BINARY_DIR@', 'test') # TODO: This is a non-standard Lit attribute and we should have another way of accessing this. config.host_triple = '@LLVM_HOST_TRIPLE@' -config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@')) config.substitutions.append(('%{libcxx}', '@LIBCXXABI_LIBCXX_PATH@')) config.substitutions.append(('%{include}', '@LIBCXXABI_SOURCE_DIR@/include')) config.substitutions.append(('%{cxx-include}', '@LIBCXXABI_HEADER_DIR@/include/c++/v1')) |