Skip to content

Commit 2db8946

Browse files
committed
Disable implicit dependency finding and parallelized builds for XCTest schemes
This is an attempt to resolve intermittent build failures that have the appearance of being caused by a race condition.
1 parent 576ed79 commit 2db8946

File tree

2 files changed

+64
-4
lines changed

2 files changed

+64
-4
lines changed

XCTest.xcodeproj/xcshareddata/xcschemes/SwiftXCTest.xcscheme

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,23 @@
33
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
6-
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
6+
parallelizeBuildables = "NO"
7+
buildImplicitDependencies = "NO">
88
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "5B5D885C1BBC938800234F36"
18+
BuildableName = "SwiftFoundation.framework"
19+
BlueprintName = "SwiftFoundation"
20+
ReferencedContainer = "container:../swift-corelibs-foundation/Foundation.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
923
<BuildActionEntry
1024
buildForTesting = "YES"
1125
buildForRunning = "YES"
@@ -29,6 +43,15 @@
2943
shouldUseLaunchSchemeArgsEnv = "YES">
3044
<Testables>
3145
</Testables>
46+
<MacroExpansion>
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "5B5D86DA1BBC74AD00234F36"
50+
BuildableName = "SwiftXCTest.framework"
51+
BlueprintName = "SwiftXCTest"
52+
ReferencedContainer = "container:XCTest.xcodeproj">
53+
</BuildableReference>
54+
</MacroExpansion>
3255
<AdditionalOptions>
3356
</AdditionalOptions>
3457
</TestAction>

XCTest.xcodeproj/xcshareddata/xcschemes/SwiftXCTestFunctionalTests.xcscheme

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,37 @@
33
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
6-
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
6+
parallelizeBuildables = "NO"
7+
buildImplicitDependencies = "NO">
88
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "5B5D885C1BBC938800234F36"
18+
BuildableName = "SwiftFoundation.framework"
19+
BlueprintName = "SwiftFoundation"
20+
ReferencedContainer = "container:../swift-corelibs-foundation/Foundation.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "YES"
26+
buildForProfiling = "YES"
27+
buildForArchiving = "YES"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "5B5D86DA1BBC74AD00234F36"
32+
BuildableName = "SwiftXCTest.framework"
33+
BlueprintName = "SwiftXCTest"
34+
ReferencedContainer = "container:XCTest.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
937
<BuildActionEntry
1038
buildForTesting = "YES"
1139
buildForRunning = "YES"
@@ -29,6 +57,15 @@
2957
shouldUseLaunchSchemeArgsEnv = "YES">
3058
<Testables>
3159
</Testables>
60+
<MacroExpansion>
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "DAA333B51C267AD6000CC115"
64+
BuildableName = "SwiftXCTestFunctionalTests"
65+
BlueprintName = "SwiftXCTestFunctionalTests"
66+
ReferencedContainer = "container:XCTest.xcodeproj">
67+
</BuildableReference>
68+
</MacroExpansion>
3269
<AdditionalOptions>
3370
</AdditionalOptions>
3471
</TestAction>

0 commit comments

Comments
 (0)