Skip to content
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

[build-script] Fix product dependencies #75909

Merged
merged 1 commit into from
Aug 17, 2024
Merged

[build-script] Fix product dependencies #75909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions utils/swift_build_support/swift_build_support/build_script_invocation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,10 @@ def compute_product_pipelines(self):
builder.add_product(products.WasmSwiftSDK,
is_enabled=self.args.build_wasmstdlib)

builder.add_product(products.SwiftTestingMacros,
is_enabled=self.args.build_swift_testing_macros)
builder.add_product(products.SwiftTesting,
is_enabled=self.args.build_swift_testing)
builder.add_product(products.SwiftPM,
is_enabled=self.args.build_swiftpm)
builder.add_product(products.SwiftFoundationTests,
Expand All @@ -678,10 +682,6 @@ def compute_product_pipelines(self):
is_enabled=self.args.build_foundation)
builder.add_product(products.SwiftSyntax,
is_enabled=self.args.build_swiftsyntax)
builder.add_product(products.SwiftTestingMacros,
is_enabled=self.args.build_swift_testing_macros)
builder.add_product(products.SwiftTesting,
is_enabled=self.args.build_swift_testing)
builder.add_product(products.SwiftFormat,
is_enabled=self.args.build_swiftformat)
builder.add_product(products.SKStressTester,
Expand Down
4 changes: 3 additions & 1 deletion utils/swift_build_support/swift_build_support/products/swift_testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from . import cmake_product
from . import product
from . import swift
from . import swift_testing_macros


class SwiftTesting(product.Product):
Expand All @@ -34,7 +35,8 @@ def product_source_name(cls):

@classmethod
def get_dependencies(cls):
return [swift.Swift]
return [swift.Swift,
swift_testing_macros.SwiftTestingMacros]

def should_build(self, host_target):
return True
Expand Down
4 changes: 3 additions & 1 deletion utils/swift_build_support/swift_build_support/products/swiftpm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from . import llvm
from . import product
from . import swift
from . import swift_testing
from . import xctest
from .. import shell
from ..targets import StdlibDeploymentTarget
Expand Down Expand Up @@ -141,4 +142,5 @@ def get_dependencies(cls):
libdispatch.LibDispatch,
foundation.Foundation,
xctest.XCTest,
llbuild.LLBuild]
llbuild.LLBuild,
swift_testing.SwiftTesting]