[libcxx-commits] [libcxx] cbe3b6b - [libc++] Move LIBCXX-DEBUG-FIXME to params.py

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-10-20T09:23:03-04:00
New Revision: cbe3b6b21f6d3e706edd9c825e2bfb6ee324945e

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

LOG: [libc++] Move LIBCXX-DEBUG-FIXME to params.py

This temporary FIXME really belongs to the testing config, not to the
specific CMake cache that enables that configuration.

Differential Revision: https://reviews.llvm.org/D112031

Added: 
    

Modified: 
    libcxx/cmake/caches/Generic-debug-iterators.cmake
    libcxx/utils/libcxx/test/params.py

Removed: 
    


################################################################################
diff  --git a/libcxx/cmake/caches/Generic-debug-iterators.cmake b/libcxx/cmake/caches/Generic-debug-iterators.cmake
index 2e9cbf77acd0..a43f27c02706 100644
--- a/libcxx/cmake/caches/Generic-debug-iterators.cmake
+++ b/libcxx/cmake/caches/Generic-debug-iterators.cmake
@@ -1,2 +1,2 @@
-set(LIBCXX_TEST_PARAMS "debug_level=1" "additional_features=LIBCXX-DEBUG-FIXME" CACHE STRING "")
+set(LIBCXX_TEST_PARAMS "debug_level=1" CACHE STRING "")
 set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

diff  --git a/libcxx/utils/libcxx/test/params.py b/libcxx/utils/libcxx/test/params.py
index c461106df8ac..8bfbf3fb2a12 100644
--- a/libcxx/utils/libcxx/test/params.py
+++ b/libcxx/utils/libcxx/test/params.py
@@ -123,10 +123,11 @@ def getStdFlag(cfg, std):
 
   Parameter(name='debug_level', choices=['', '0', '1'], type=str, default='',
             help="The debugging level to enable in the test suite.",
-            actions=lambda debugLevel: [] if debugLevel == '' else [
+            actions=lambda debugLevel: [] if debugLevel == '' else filter(None, [
               AddFeature('debug_level={}'.format(debugLevel)),
-              AddCompileFlag('-D_LIBCPP_DEBUG={}'.format(debugLevel))
-            ]),
+              AddCompileFlag('-D_LIBCPP_DEBUG={}'.format(debugLevel)),
+              AddFeature('LIBCXX-DEBUG-FIXME') if debugLevel == '1' else None
+            ])),
 
   Parameter(name='use_sanitizer', choices=['', 'Address', 'Undefined', 'Memory', 'MemoryWithOrigins', 'Thread', 'DataFlow', 'Leaks'], type=str, default='',
             help="An optional sanitizer to enable when building and running the test suite.",