[libcxx-commits] [libcxx] 1013468 - [libc++] Temporarily force-set the LIBCXX_TEST_CONFIG cache value

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-08-29T18:07:26-04:00
New Revision: 1013468fe6f513ba6a1770e7043506bd0f026ffe

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

LOG: [libc++] Temporarily force-set the LIBCXX_TEST_CONFIG cache value

This ensures that existing CMake build trees will start using the new
default without having to nuke their build directories.

Added: 
    

Modified: 
    libcxx/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index f6cda98a0f5f..ea0aa0a259a2 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -110,7 +110,7 @@ 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/configs/legacy.cfg.in" CACHE STRING
-    "The Lit testing configuration to use when running the tests.")
+    "The Lit testing configuration to use when running the tests." FORCE) # TODO: Stop using 'FORCE' once we can assume all CMake build dirs have been re-generated
 set(LIBCXX_TEST_PARAMS "" CACHE STRING
     "A list of parameters to run the Lit test suite with.")