[libcxx-commits] [PATCH] D122597: [libc++][libc++abi] Serialize the enable_assertions Lit parameter in the generated config

[Louis Dionne via Phabricator via libcxx-commits]

ldionne created this revision.
Herald added a subscriber: mgorny.
Herald added a project: All.
ldionne requested review of this revision.
Herald added projects: libc++, libc++abi.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.
Herald added a reviewer: libc++abi.

This means that re-running with llvm-lit in that configuration will
work as expected. This also enables assertions in libc++abi in the
Generic-assertions CI job, which was disabled previously.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D122597

Files:
  libcxx/cmake/caches/Generic-assertions.cmake
  libcxx/test/CMakeLists.txt
  libcxxabi/test/CMakeLists.txt


Index: libcxxabi/test/CMakeLists.txt
===================================================================
--- libcxxabi/test/CMakeLists.txt
+++ libcxxabi/test/CMakeLists.txt
@@ -79,6 +79,10 @@
   serialize_lit_param(enable_exceptions False)
 endif()
 
+if (LIBCXXABI_ENABLE_ASSERTIONS)
+  serialize_lit_param(enable_assertions True)
+endif()
+
 serialize_lit_param(enable_experimental False)
 
 if (LLVM_USE_SANITIZER)
Index: libcxx/test/CMakeLists.txt
===================================================================
--- libcxx/test/CMakeLists.txt
+++ libcxx/test/CMakeLists.txt
@@ -104,6 +104,10 @@
   serialize_lit_param(enable_debug_tests False)
 endif()
 
+if (LIBCXX_ENABLE_ASSERTIONS)
+  serialize_lit_param(enable_assertions True)
+endif()
+
 if (CMAKE_CXX_COMPILER_TARGET)
   serialize_lit_param(target_triple "\"${CMAKE_CXX_COMPILER_TARGET}\"")
 else()
Index: libcxx/cmake/caches/Generic-assertions.cmake
===================================================================
--- libcxx/cmake/caches/Generic-assertions.cmake
+++ libcxx/cmake/caches/Generic-assertions.cmake
@@ -1,3 +1,2 @@
 set(LIBCXX_ENABLE_ASSERTIONS ON CACHE BOOL "")
-set(LIBCXX_TEST_PARAMS "enable_assertions=True" CACHE STRING "")
-set(LIBCXXABI_TEST_PARAMS "enable_assertions=True" CACHE STRING "")
+set(LIBCXXABI_ENABLE_ASSERTIONS ON CACHE BOOL "")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D122597.418633.patch
Type: text/x-patch
Size: 1333 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220328/8d41feb5/attachment-0001.bin>