Skip to content

Commit eac23ed

Browse files
committed
tests: deprecate the swift_in_compiler lit feature
Now that SwiftCompilerSources are always enabled, `swift_in_compiler` is not needed anymore. Set this feature unconditionally for tests which still include `REQUIRES: swift_in_compiler`.
1 parent 410b81b commit eac23ed

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

test/lit.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -901,6 +901,10 @@ if 'swift_evolve' in lit_config.params:
901901
if not 'swift_driver' in lit_config.params:
902902
config.available_features.add("cplusplus_driver")
903903

904+
# SwiftCompilerSources are now always enabled:
905+
# TODO: remove all the `REQUIRES: swift_in_compiler` in tests
906+
config.available_features.add('swift_in_compiler')
907+
904908
# Check if we need to run lit tests using the legacy driver or the new driver
905909
# The default for existing test runs is to use the legacy driver.
906910
# The new driver is tested separately.

test/lit.site.cfg.in

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,6 @@ config.swift_stdlib_enable_objc_interop = "@SWIFT_STDLIB_ENABLE_OBJC_INTEROP@" =
166166
# Configured in DarwinSDKs.cmake
167167
config.freestanding_sdk_name = "@SWIFT_SDK_FREESTANDING_LIB_SUBDIR@"
168168

169-
if "@BOOTSTRAPPING_MODE@" != "OFF":
170-
config.available_features.add('swift_in_compiler')
171-
172-
if "@BOOTSTRAPPING_MODE@" == 'HOSTTOOLS':
173-
config.available_features.add('hosttools_mode')
174-
elif "@BOOTSTRAPPING_MODE@" == 'BOOTSTRAPPING':
175-
config.available_features.add('bootstrapping_mode')
176-
elif "@BOOTSTRAPPING_MODE@" == 'BOOTSTRAPPING-WITH-HOSTLIBS':
177-
config.available_features.add('bootstrapping_with_hostlibs_mode')
178-
179169
if '@SWIFT_BUILD_SWIFT_SYNTAX@' == 'TRUE':
180170
config.available_features.add('swift_swift_parser')
181171

validation-test/lit.site.cfg.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,6 @@ config.swift_stdlib_enable_objc_interop = "@SWIFT_STDLIB_ENABLE_OBJC_INTEROP@" =
145145
# Configured in DarwinSDKs.cmake
146146
config.freestanding_sdk_name = "@SWIFT_SDK_FREESTANDING_LIB_SUBDIR@"
147147

148-
if "@BOOTSTRAPPING_MODE@" != "OFF":
149-
config.available_features.add('swift_in_compiler')
150-
151148
# Let the main config do the real work.
152149
config.test_exec_root = os.path.dirname(os.path.realpath(__file__))
153150
lit_config.load_config(config, "@SWIFT_SOURCE_DIR@/validation-test/lit.cfg")

0 commit comments

Comments
 (0)