[libcxx-commits] [PATCH] D112031: [libc++] Move LIBCXX-DEBUG-FIXME to params.py

[Louis Dionne via Phabricator via libcxx-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGcbe3b6b21f6d: [libc++] Move LIBCXX-DEBUG-FIXME to params.py (authored by ldionne).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D112031/new/

https://reviews.llvm.org/D112031

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


Index: libcxx/utils/libcxx/test/params.py
===================================================================
--- libcxx/utils/libcxx/test/params.py
+++ libcxx/utils/libcxx/test/params.py
@@ -123,10 +123,11 @@
 
   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.",
Index: libcxx/cmake/caches/Generic-debug-iterators.cmake
===================================================================
--- libcxx/cmake/caches/Generic-debug-iterators.cmake
+++ 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 "")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D112031.380932.patch
Type: text/x-patch
Size: 1561 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20211020/5d87d54a/attachment.bin>