Skip to content

Commit cbe3b6b

Browse files
committed
[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
1 parent e9320b1 commit cbe3b6b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
set(LIBCXX_TEST_PARAMS "debug_level=1" "additional_features=LIBCXX-DEBUG-FIXME" CACHE STRING "")
1+
set(LIBCXX_TEST_PARAMS "debug_level=1" CACHE STRING "")
22
set(LIBCXXABI_TEST_PARAMS "${LIBCXX_TEST_PARAMS}" CACHE STRING "")

libcxx/utils/libcxx/test/params.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,11 @@ def getStdFlag(cfg, std):
123123

124124
Parameter(name='debug_level', choices=['', '0', '1'], type=str, default='',
125125
help="The debugging level to enable in the test suite.",
126-
actions=lambda debugLevel: [] if debugLevel == '' else [
126+
actions=lambda debugLevel: [] if debugLevel == '' else filter(None, [
127127
AddFeature('debug_level={}'.format(debugLevel)),
128-
AddCompileFlag('-D_LIBCPP_DEBUG={}'.format(debugLevel))
129-
]),
128+
AddCompileFlag('-D_LIBCPP_DEBUG={}'.format(debugLevel)),
129+
AddFeature('LIBCXX-DEBUG-FIXME') if debugLevel == '1' else None
130+
])),
130131

131132
Parameter(name='use_sanitizer', choices=['', 'Address', 'Undefined', 'Memory', 'MemoryWithOrigins', 'Thread', 'DataFlow', 'Leaks'], type=str, default='',
132133
help="An optional sanitizer to enable when building and running the test suite.",

0 commit comments

Comments
 (0)