Skip to content

Commit a68cbb6

Browse files
authored
Merge pull request #75838 from swiftlang/revert-75822-swift-testing-disable
Revert "[build-preset] Temporarily disable swift-testing until CI is ready"
2 parents 06604a0 + 1f67284 commit a68cbb6

File tree

1 file changed

+20
-30
lines changed

1 file changed

+20
-30
lines changed

utils/build-presets.ini

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,8 @@ sourcekit-lsp
383383
# swift-inspect
384384
swiftsyntax
385385
swiftformat
386-
# Temporarily disable swift-testing until CI is ready
387-
# swift-testing
388-
# swift-testing-macros
386+
swift-testing
387+
swift-testing-macros
389388

390389
skstresstester
391390

@@ -409,9 +408,8 @@ install-swiftpm
409408
install-swift-driver
410409
install-swiftsyntax
411410
install-swiftformat
412-
# Temporarily disable swift-testing until CI is ready
413-
# install-swift-testing
414-
# install-swift-testing-macros
411+
install-swift-testing
412+
install-swift-testing-macros
415413

416414
[preset: buildbot_incremental,tools=RA,stdlib=RA,apple_silicon]
417415
mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
@@ -845,9 +843,8 @@ mixin-preset=
845843
llbuild
846844
swiftpm
847845
swift-driver
848-
# Temporarily disable swift-testing until CI is ready
849-
# swift-testing
850-
# swift-testing-macros
846+
swift-testing
847+
swift-testing-macros
851848
xctest
852849
swiftdocc
853850
swiftformat
@@ -861,9 +858,8 @@ install-llbuild
861858
install-swiftpm
862859
install-swift-driver
863860
install-swiftsyntax
864-
# Temporarily disable swift-testing until CI is ready
865-
# install-swift-testing
866-
# install-swift-testing-macros
861+
install-swift-testing
862+
install-swift-testing-macros
867863
install-xctest
868864
install-prefix=/usr
869865
install-sourcekit-lsp
@@ -1192,9 +1188,8 @@ llbuild
11921188
swiftpm
11931189
swift-driver
11941190
xctest
1195-
# Temporarily disable swift-testing until CI is ready
1196-
# swift-testing
1197-
# swift-testing-macros
1191+
swift-testing
1192+
swift-testing-macros
11981193
foundation
11991194
libdispatch
12001195
swiftsyntax
@@ -1212,9 +1207,8 @@ install-swiftsyntax
12121207
install-foundation
12131208
install-libdispatch
12141209
install-xctest
1215-
# Temporarily disable swift-testing until CI is ready
1216-
# install-swift-testing
1217-
# install-swift-testing-macros
1210+
install-swift-testing
1211+
install-swift-testing-macros
12181212
install-swiftformat
12191213

12201214
[preset: buildbot_incremental_linux,long_test]
@@ -1338,9 +1332,8 @@ swift-driver
13381332
# Failing to build in CI: rdar://78408440
13391333
# swift-inspect
13401334
swiftsyntax
1341-
# Temporarily disable swift-testing until CI is ready
1342-
# swift-testing
1343-
# swift-testing-macros
1335+
swift-testing
1336+
swift-testing-macros
13441337
swiftformat
13451338
playgroundsupport
13461339
indexstore-db
@@ -1385,9 +1378,8 @@ install-llbuild
13851378
install-swiftpm
13861379
install-swift-driver
13871380
install-swiftsyntax
1388-
# Temporarily disable swift-testing until CI is ready
1389-
# install-swift-testing
1390-
# install-swift-testing-macros
1381+
install-swift-testing
1382+
install-swift-testing-macros
13911383
install-playgroundsupport
13921384
install-sourcekit-lsp
13931385
install-swiftformat
@@ -1711,9 +1703,8 @@ swiftpm
17111703
# swift-inspect
17121704
swift-driver
17131705
swiftsyntax
1714-
# Temporarily disable swift-testing until CI is ready
1715-
# swift-testing
1716-
# swift-testing-macros
1706+
swift-testing
1707+
swift-testing-macros
17171708
swiftformat
17181709
swiftdocc
17191710

@@ -1733,9 +1724,8 @@ install-llbuild
17331724
install-swiftpm
17341725
install-swift-driver
17351726
install-swiftsyntax
1736-
# Temporarily disable swift-testing until CI is ready
1737-
# install-swift-testing
1738-
# iinstall-swift-testing-macros
1727+
install-swift-testing
1728+
install-swift-testing-macros
17391729
install-swiftdocc
17401730
install-swiftformat
17411731

0 commit comments

Comments
 (0)