Skip to content

Commit b0ef6f2

Browse files
committed
fix
1 parent c4b4878 commit b0ef6f2

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

utils/build-presets.ini

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -867,8 +867,7 @@ build-embedded-stdlib-cross-compiling
867867
# Executes the lit tests for the installable package that is created
868868
# Assumes the swift-integration-tests repo is checked out
869869

870-
# TODO: Re-enable this before landing!
871-
#test-installable-package
870+
test-installable-package
872871

873872
# Build the benchmarks against the toolchain.
874873
toolchain-benchmarks
@@ -1387,8 +1386,7 @@ install-prefix=%(install_toolchain_dir)s/usr
13871386
# Executes the lit tests for the installable package that is created
13881387
# Assumes the swift-integration-tests repo is checked out
13891388

1390-
# TODO: Re-enable this before landing!
1391-
#test-installable-package
1389+
test-installable-package
13921390

13931391
# Make sure that we can build the benchmarks with swiftpm against the toolchain
13941392
toolchain-benchmarks

utils/swift_build_support/swift_build_support/products/swift_testing.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ def product_source_name(cls):
3131

3232
@classmethod
3333
def get_dependencies(cls):
34-
return [swift.Swift,
35-
swiftsyntax.SwiftSyntax]
34+
return [swift.Swift]
3635

3736
def should_build(self, host_target):
3837
return True
@@ -44,6 +43,8 @@ def build(self, host_target):
4443
# `install_with_cmake` later which already has the same prefix.
4544
self.cmake_options.define('CMAKE_INSTALL_PREFIX', '')
4645

46+
self.cmake_options.define('CMAKE_BUILD_TYPE', self.args.build_variant)
47+
4748
build_root = os.path.dirname(self.build_dir)
4849
swift_build_dir = os.path.join(
4950
'..', build_root, '%s-%s' % ('swift', host_target))

0 commit comments

Comments
 (0)