Skip to content

[build-script] Don't build StdlibUnittest when building SwiftPM #27813

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 2 commits into from
Oct 21, 2019
Merged

[build-script] Don't build StdlibUnittest when building SwiftPM #27813

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a18570
[build-script] Push build-swift-stdlib-unittest-extra one level down
ahoppen Oct 21, 2019
db7815c
[build-script] Don't build StdlibUnittest when building SwiftPM
ahoppen Oct 21, 2019
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
21 changes: 18 additions & 3 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,6 @@ reconfigure
verbose-build
build-ninja

build-swift-stdlib-unittest-extra


[preset: buildbot_incremental_base_all_platforms]
mixin-preset=buildbot_incremental_base

Expand All @@ -321,6 +318,8 @@ build-subdir=buildbot_incremental
release
assertions

build-swift-stdlib-unittest-extra

libcxx

# Build llbuild & swiftpm here
Expand Down Expand Up @@ -381,6 +380,8 @@ mixin-preset=buildbot_incremental_base
# of the XCTest Xcode project.
xctest

build-swift-stdlib-unittest-extra

dash-dash

# This preset is meant to test XCTest, not Swift or Foundation. We don't
Expand Down Expand Up @@ -416,6 +417,8 @@ build-subdir=buildbot_incremental_asan
release-debuginfo
assertions

build-swift-stdlib-unittest-extra

dash-dash

# FIXME: Swift/ASan does not support iOS yet.
Expand All @@ -442,6 +445,8 @@ release-debuginfo
assertions
enable-tsan

build-swift-stdlib-unittest-extra

dash-dash

skip-build-ios
Expand All @@ -460,6 +465,8 @@ build-subdir=buildbot_incremental_asan_ubsan
release-debuginfo
assertions

build-swift-stdlib-unittest-extra

dash-dash

# FIXME: Swift/UBSan does not support mac os x yet.
Expand Down Expand Up @@ -489,6 +496,8 @@ build-subdir=buildbot_incremental_asan_debug
# Build Release with debug info, so that we can symbolicate backtraces.
assertions

build-swift-stdlib-unittest-extra

dash-dash

# FIXME: Swift/ASan does not support iOS yet.
Expand Down Expand Up @@ -519,6 +528,8 @@ build-subdir=buildbot_incremental
release
assertions

build-swift-stdlib-unittest-extra

# We run the OS X tests and validation tests.
test
validation-test
Expand Down Expand Up @@ -1353,6 +1364,8 @@ build-subdir=buildbot_incremental
release
assertions

build-swift-stdlib-unittest-extra

libcxx

# Build llbuild & swiftpm here
Expand Down Expand Up @@ -1396,6 +1409,8 @@ build-subdir=buildbot_incremental
release
assertions

build-swift-stdlib-unittest-extra

# Build llbuild & swiftpm here
llbuild
swiftpm
Expand Down