[libcxx-commits] [PATCH] D105991: [runtimes] Serialize all Lit params instead of passing them to add_lit_testsuite

[Louis Dionne via Phabricator via libcxx-commits]

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

add_lit_testsuite() takes Lit parameters passed to it and adds them
to the parameters used globally when running all test suites. That
means that a target like `check-all`, which ends up calling Lit on
the whole monorepo, will see the test parameters for all the individual
project's test suites.

So, for example, it would see `--param std=c++03` (from libc++abi), and
`--param std=c++03` (from libc++), and `--param whatever` (from another
project being tested at the same time). While always unclean, that works
when the parameters all agree. However, if the parameters share the same
name but have different values, only one of those two values will be used
and it will be incredibly confusing to understand why one of the test
suites is being run with the incorrect parameter value.

For that reason, this commit moves away from using add_lit_testsuite()'s
PARAM functionality, and serializes the parameter values for the runtimes
in the generated config.py file instead, which is local to the specific
test suite.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D105991

Files:
  libcxx/test/CMakeLists.txt
  libcxxabi/test/CMakeLists.txt
  libunwind/test/CMakeLists.txt


Index: libunwind/test/CMakeLists.txt
===================================================================
--- libunwind/test/CMakeLists.txt
+++ libunwind/test/CMakeLists.txt
@@ -44,6 +44,12 @@
   serialize_lit_param(enable_32bit True)
 endif()
 
+foreach(param IN LISTS LIBUNWIND_TEST_PARAMS)
+  string(REGEX REPLACE "(.+)=(.+)" "\\1" name "${param}")
+  string(REGEX REPLACE "(.+)=(.+)" "\\2" value "${param}")
+  serialize_lit_param("${name}" "\"${value}\"")
+endforeach()
+
 configure_lit_site_cfg(
   "${LIBUNWIND_TEST_CONFIG}"
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
@@ -51,5 +57,4 @@
 
 add_lit_testsuite(check-unwind "Running libunwind tests"
   ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS unwind ${LIBUNWIND_TEST_DEPS}
-  PARAMS "${LIBUNWIND_TEST_PARAMS}")
+  DEPENDS unwind ${LIBUNWIND_TEST_DEPS})
Index: libcxxabi/test/CMakeLists.txt
===================================================================
--- libcxxabi/test/CMakeLists.txt
+++ libcxxabi/test/CMakeLists.txt
@@ -94,6 +94,12 @@
   serialize_lit_param(enable_32bit True)
 endif()
 
+foreach(param IN LISTS LIBCXXABI_TEST_PARAMS)
+  string(REGEX REPLACE "(.+)=(.+)" "\\1" name "${param}")
+  string(REGEX REPLACE "(.+)=(.+)" "\\2" value "${param}")
+  serialize_lit_param("${name}" "\"${value}\"")
+endforeach()
+
 configure_lit_site_cfg(
   "${LIBCXXABI_TEST_CONFIG}"
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
@@ -101,5 +107,4 @@
 
 add_lit_testsuite(check-cxxabi "Running libcxxabi tests"
   ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS ${LIBCXXABI_TEST_DEPS}
-  PARAMS "${LIBCXXABI_TEST_PARAMS}")
+  DEPENDS ${LIBCXXABI_TEST_DEPS})
Index: libcxx/test/CMakeLists.txt
===================================================================
--- libcxx/test/CMakeLists.txt
+++ libcxx/test/CMakeLists.txt
@@ -117,6 +117,12 @@
   serialize_lit_param(enable_32bit True)
 endif()
 
+foreach(param IN LISTS LIBCXX_TEST_PARAMS)
+  string(REGEX REPLACE "(.+)=(.+)" "\\1" name "${param}")
+  string(REGEX REPLACE "(.+)=(.+)" "\\2" value "${param}")
+  serialize_lit_param("${name}" "\"${value}\"")
+endforeach()
+
 if (NOT DEFINED LIBCXX_TEST_DEPS)
   message(FATAL_ERROR "Expected LIBCXX_TEST_DEPS to be defined")
 endif()
@@ -136,8 +142,7 @@
   add_lit_testsuite(check-cxx
     "Running libcxx tests"
     ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS cxx-test-depends
-    PARAMS "${LIBCXX_TEST_PARAMS}")
+    DEPENDS cxx-test-depends)
 endif()
 
 if (LIBCXX_GENERATE_COVERAGE)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D105991.358619.patch
Type: text/x-patch
Size: 2426 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210714/dfc446f4/attachment-0001.bin>