Skip to content

Commit 236c0fe

Browse files
authored
Merge pull request #81505 from bkhouri/t/6.2/update_presets
preset: treat swift testing the same as xctest
2 parents 775a9bc + c2615fc commit 236c0fe

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

utils/build-presets.ini

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,8 @@ mixin-preset=buildbot_incremental_base
424424
# on Foundation, so that is built as well. On OS X, Foundation is built as part
425425
# of the XCTest Xcode project.
426426
xctest
427+
swift-testing
428+
swift-testing-macros
427429

428430
build-swift-stdlib-unittest-extra
429431

@@ -441,6 +443,8 @@ skip-test-foundation
441443
release
442444
assertions
443445
xctest
446+
swift-testing
447+
swift-testing-macros
444448
test
445449

446450
skip-test-cmark
@@ -625,6 +629,8 @@ swiftformat
625629
swift-driver
626630
indexstore-db
627631
sourcekit-lsp
632+
swift-testing
633+
swift-testing-macros
628634
# Failing to build in CI: rdar://78408440
629635
# swift-inspect
630636
install-llvm
@@ -635,6 +641,8 @@ install-swiftpm
635641
install-swiftsyntax
636642
install-swift-driver
637643
install-swiftformat
644+
install-swift-testing
645+
install-swift-testing-macros
638646

639647
# We need to build the unittest extras so we can test
640648
build-swift-stdlib-unittest-extra
@@ -1123,6 +1131,8 @@ lldb
11231131
foundation
11241132
swiftpm
11251133
swift-driver
1134+
swift-testing
1135+
swift-testing-macros
11261136
xctest
11271137

11281138
build-subdir=buildbot_linux
@@ -1136,6 +1146,8 @@ install-foundation
11361146
install-swiftpm
11371147
install-swift-driver
11381148
install-swiftsyntax
1149+
install-swift-testing
1150+
install-swift-testing-macros
11391151
install-xctest
11401152
install-prefix=/usr
11411153
swift-install-components=autolink-driver;compiler;clang-builtin-headers;libexec;stdlib;swift-remote-mirror;sdk-overlay;dev
@@ -3015,8 +3027,12 @@ build-subdir=compat_linux
30153027
foundation
30163028
libdispatch
30173029
xctest
3030+
swift-testing
3031+
swift-testing-macros
30183032
install-foundation
30193033
install-libdispatch
3034+
install-swift-testing
3035+
install-swift-testing-macros
30203036
install-xctest
30213037
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;libexec;swift-remote-mirror;sdk-overlay;license
30223038

@@ -3209,6 +3225,8 @@ skip-early-swift-driver
32093225

32103226
llbuild
32113227
xctest
3228+
swift-testing
3229+
swift-testing-macros
32123230
swiftpm
32133231

32143232
swift-include-tests=0
@@ -3233,4 +3251,6 @@ install-foundation
32333251
install-libdispatch
32343252
install-llbuild
32353253
install-swiftpm
3254+
install-swift-testing
3255+
install-swift-testing-macros
32363256
install-xctest

0 commit comments

Comments
 (0)