Skip to content

Ensure Foundation tests don't run when passing --skip-foundation-tests #75573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 31, 2024
Merged

Ensure Foundation tests don't run when passing --skip-foundation-tests #75573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2411005
Ensure Foundation tests don't run when passing --skip-foundation-tests
jmschonfeld Jul 30, 2024
475d159
Fix test failure
jmschonfeld Jul 30, 2024
e9bd790
Fix additional test failures
jmschonfeld Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions utils/build_swift/build_swift/driver_arguments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ def _apply_default_arguments(args):
args.test_android = False
args.test_cmark = False
args.test_swiftpm = False
args.test_foundation = False
args.test_swift_driver = False
args.test_swiftsyntax = False
args.test_indexstoredb = False
Expand Down Expand Up @@ -1312,6 +1313,8 @@ def create_argument_parser():
help='skip testing cmark')
option('--skip-test-swiftpm', toggle_false('test_swiftpm'),
help='skip testing swiftpm')
option('--skip-test-foundation', toggle_false('test_foundation'),
help='skip testing Foundation')
option('--skip-test-swift-driver', toggle_false('test_swift_driver'),
help='skip testing Swift driver')
option('--skip-test-swiftsyntax', toggle_false('test_swiftsyntax'),
Expand Down
2 changes: 2 additions & 0 deletions utils/build_swift/tests/expected_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@
'test_playgroundsupport': True,
'test_cmark': False,
'test_swiftpm': False,
'test_foundation': False,
'test_swift_driver': False,
'test_swiftsyntax': False,
'test_indexstoredb': False,
Expand Down Expand Up @@ -738,6 +739,7 @@ class BuildScriptImplOption(_BaseOption):
dest='test_playgroundsupport'),
DisableOption('--skip-test-cmark', dest='test_cmark'),
DisableOption('--skip-test-swiftpm', dest='test_swiftpm'),
DisableOption('--skip-test-foundation', dest='test_foundation'),
DisableOption('--skip-test-swift-driver', dest='test_swift_driver'),
DisableOption('--skip-test-swiftsyntax', dest='test_swiftsyntax'),
DisableOption('--skip-test-indexstore-db', dest='test_indexstoredb'),
Expand Down
2 changes: 1 addition & 1 deletion utils/swift_build_support/swift_build_support/products/foundationtests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def should_install(self, host_target):
return False

def should_test(self, host_target):
return True
return self.args.test_foundation

def configuration(self):
return 'release' if self.is_release() else 'debug'
Expand Down
2 changes: 1 addition & 1 deletion utils/swift_build_support/swift_build_support/products/swiftfoundationtests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def should_install(self, host_target):
return False

def should_test(self, host_target):
return True
return self.args.test_foundation

def configuration(self):
return 'release' if self.is_release() else 'debug'
Expand Down