[libcxx-commits] [libcxx] f9ca205 - [libc++] Move the default site config template alongside other config files

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-08-29T17:14:20-04:00
New Revision: f9ca2057b95e680d8a62dda8b303a085d69e13cd

URL: https://github.com/llvm/llvm-project/commit/f9ca2057b95e680d8a62dda8b303a085d69e13cd
DIFF: https://github.com/llvm/llvm-project/commit/f9ca2057b95e680d8a62dda8b303a085d69e13cd.diff

LOG: [libc++] Move the default site config template alongside other config files

Added: 
    libcxx/test/configs/legacy.cfg.in

Modified: 
    libcxx/CMakeLists.txt
    libcxx/docs/TestingLibcxx.rst

Removed: 
    libcxx/test/lit.site.cfg.in


################################################################################
diff  --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index fd877f1adaeb..f6cda98a0f5f 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -109,7 +109,7 @@ option(LIBCXX_ENABLE_FILESYSTEM "Build filesystem as part of the main libc++ lib
 option(LIBCXX_INCLUDE_TESTS "Build the libc++ tests." ${LLVM_INCLUDE_TESTS})
 option(LIBCXX_ENABLE_PARALLEL_ALGORITHMS "Enable the parallel algorithms library. This requires the PSTL to be available." OFF)
 option(LIBCXX_TEST_GDB_PRETTY_PRINTERS "Test gdb pretty printers." OFF)
-set(LIBCXX_TEST_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/test/lit.site.cfg.in" CACHE STRING
+set(LIBCXX_TEST_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/test/configs/legacy.cfg.in" CACHE STRING
     "The Lit testing configuration to use when running the tests.")
 set(LIBCXX_TEST_PARAMS "" CACHE STRING
     "A list of parameters to run the Lit test suite with.")

diff  --git a/libcxx/docs/TestingLibcxx.rst b/libcxx/docs/TestingLibcxx.rst
index 0c9c87d489bc..d42becfd5c3d 100644
--- a/libcxx/docs/TestingLibcxx.rst
+++ b/libcxx/docs/TestingLibcxx.rst
@@ -74,14 +74,15 @@ Using a custom site configuration
 
 By default, the libc++ test suite will use a site configuration that matches
 the current CMake configuration. It does so by generating a ``lit.site.cfg``
-file in the build directory from the ``libcxx/test/lit.site.cfg.in`` template,
-and pointing ``llvm-lit`` (which is a wrapper around ``llvm/utils/lit/lit.py``)
-to that file. So when you're running ``<build>/bin/llvm-lit``, the generated
-``lit.site.cfg`` file is always loaded instead of ``libcxx/test/lit.cfg.py``.
-If you want to use a custom site configuration, simply point the CMake build
-to it using ``-DLIBCXX_TEST_CONFIG=<path-to-site-config>``, and that site
-configuration will be used instead. That file can use CMake variables inside
-itself to make configuration easier.
+file in the build directory from one of the configuration file templates in
+``libcxx/test/configs/``, and pointing ``llvm-lit`` (which is a wrapper around
+``llvm/utils/lit/lit.py``) to that file. So when you're running
+``<build>/bin/llvm-lit``, the generated ``lit.site.cfg`` file is always loaded
+instead of ``libcxx/test/lit.cfg.py``. If you want to use a custom site
+configuration, simply point the CMake build to it using
+``-DLIBCXX_TEST_CONFIG=<path-to-site-config>``, and that site configuration
+will be used instead. That file can use CMake variables inside it to make
+configuration easier.
 
    .. code-block:: bash
 

diff  --git a/libcxx/test/lit.site.cfg.in b/libcxx/test/configs/legacy.cfg.in
similarity index 100%
rename from libcxx/test/lit.site.cfg.in
rename to libcxx/test/configs/legacy.cfg.in