Skip to content

Commit 9bff13e

Browse files
authored
Merge pull request #15147 from davezarzycki/nfc_unbreak_unified_builds
[Testing] Correctly handle unset SWIFT_ENABLE_GUARANTEED_NORMAL_ARGUMENTS
2 parents 760a9a7 + 156fb0b commit 9bff13e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

test/lit.site.cfg.in

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ config.android_ndk_gcc_version = "@SWIFT_ANDROID_NDK_GCC_VERSION@"
3636
config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
3737
config.lldb_build_root = "@LLDB_BUILD_DIR@"
3838

39+
# Please remember to handle empty strings and/or unset variables correctly.
40+
3941
if "@SWIFT_ASAN_BUILD@" == "TRUE":
4042
config.available_features.add("asan")
4143
else:
@@ -89,10 +91,10 @@ config.available_features.add("CMAKE_GENERATOR=@CMAKE_GENERATOR@")
8991
if "@SWIFT_ENABLE_SOURCEKIT_TESTS@" == "TRUE":
9092
config.available_features.add('sourcekit')
9193

92-
if "@SWIFT_ENABLE_GUARANTEED_NORMAL_ARGUMENTS@" == "FALSE":
93-
config.available_features.add('plus_one_runtime')
94-
else:
94+
if "@SWIFT_ENABLE_GUARANTEED_NORMAL_ARGUMENTS@" == "TRUE":
9595
config.available_features.add('plus_zero_runtime')
96+
else:
97+
config.available_features.add('plus_one_runtime')
9698

9799
# Let the main config do the real work.
98100
if config.test_exec_root is None:

0 commit comments

Comments
 (0)