[libcxx-commits] [PATCH] D81824: [LIBCXX] add possibility to load an additional test configuration to CMake

[Dominik Montada via Phabricator via libcxx-commits]

gargaroff created this revision.
gargaroff added a reviewer: ldionne.
Herald added subscribers: libcxx-commits, dexonsmith, mgorny.
Herald added a project: libc++.
Herald added a reviewer: libc++.

Give the user the possibility to load an additional configuration
when setting up the testing environment, which is loaded after the
auto-generated configuration.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D81824

Files:
  libcxx/test/CMakeLists.txt
  libcxx/test/lit.site.cfg.in


Index: libcxx/test/lit.site.cfg.in
===================================================================
--- libcxx/test/lit.site.cfg.in
+++ libcxx/test/lit.site.cfg.in
@@ -39,6 +39,10 @@
 # Code signing
 config.llvm_codesign_identity   = "@LLVM_CODESIGNING_IDENTITY@"
 
+# Allow the user to inject additional config parameters at this point
+if bool("@LIBCXX_ADDITIONAL_CONFIG@"):
+    lit_config.load_config(config, "@LIBCXX_ADDITIONAL_CONFIG@")
+
 # Let the main config do the real work.
 config.loaded_site_config = True
 lit_config.load_config(config, "@LIBCXX_SOURCE_DIR@/test/lit.cfg")
Index: libcxx/test/CMakeLists.txt
===================================================================
--- libcxx/test/CMakeLists.txt
+++ libcxx/test/CMakeLists.txt
@@ -83,6 +83,8 @@
     "TargetInfo to use when setting up test environment.")
 set(LIBCXX_EXECUTOR "${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/../utils/run.py" CACHE STRING
     "Executor to use when running tests.")
+set(LIBCXX_ADDITIONAL_CONFIG "" CACHE STRING
+    "Additional config to load when setting up test environment.")
 
 set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!")
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D81824.270674.patch
Type: text/x-patch
Size: 1178 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20200615/1c795b70/attachment.bin>