Skip to content

Commit f89db53

Browse files
authored
Ensure Foundation tests don't run when passing --skip-foundation-tests (#75573)
1 parent af8b19d commit f89db53

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

utils/build_swift/build_swift/driver_arguments.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ def _apply_default_arguments(args):
213213
args.test_android = False
214214
args.test_cmark = False
215215
args.test_swiftpm = False
216+
args.test_foundation = False
216217
args.test_swift_driver = False
217218
args.test_swiftsyntax = False
218219
args.test_indexstoredb = False
@@ -1316,6 +1317,8 @@ def create_argument_parser():
13161317
help='skip testing cmark')
13171318
option('--skip-test-swiftpm', toggle_false('test_swiftpm'),
13181319
help='skip testing swiftpm')
1320+
option('--skip-test-foundation', toggle_false('test_foundation'),
1321+
help='skip testing Foundation')
13191322
option('--skip-test-swift-driver', toggle_false('test_swift_driver'),
13201323
help='skip testing Swift driver')
13211324
option('--skip-test-swiftsyntax', toggle_false('test_swiftsyntax'),

utils/build_swift/tests/expected_options.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@
308308
'test_playgroundsupport': True,
309309
'test_cmark': False,
310310
'test_swiftpm': False,
311+
'test_foundation': False,
311312
'test_swift_driver': False,
312313
'test_swiftsyntax': False,
313314
'test_indexstoredb': False,
@@ -740,6 +741,7 @@ class BuildScriptImplOption(_BaseOption):
740741
dest='test_playgroundsupport'),
741742
DisableOption('--skip-test-cmark', dest='test_cmark'),
742743
DisableOption('--skip-test-swiftpm', dest='test_swiftpm'),
744+
DisableOption('--skip-test-foundation', dest='test_foundation'),
743745
DisableOption('--skip-test-swift-driver', dest='test_swift_driver'),
744746
DisableOption('--skip-test-swiftsyntax', dest='test_swiftsyntax'),
745747
DisableOption('--skip-test-indexstore-db', dest='test_indexstoredb'),

utils/swift_build_support/swift_build_support/products/foundationtests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def should_install(self, host_target):
5050
return False
5151

5252
def should_test(self, host_target):
53-
return True
53+
return self.args.test_foundation
5454

5555
def configuration(self):
5656
return 'release' if self.is_release() else 'debug'

utils/swift_build_support/swift_build_support/products/swiftfoundationtests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def should_install(self, host_target):
5050
return False
5151

5252
def should_test(self, host_target):
53-
return True
53+
return self.args.test_foundation
5454

5555
def configuration(self):
5656
return 'release' if self.is_release() else 'debug'

0 commit comments

Comments
 (0)