Skip to content

Commit 96c5bae

Browse files
matthewseamanmatthewseaman
committed
Update unit tests
1 parent 92219b6 commit 96c5bae

File tree

3 files changed

+76
-6
lines changed

3 files changed

+76
-6
lines changed

‎Tests/BuildTests/BuildPlanTests.swift

+15-1
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
790790
.equal(self.j),
791791
"-DSWIFT_PACKAGE",
792792
"-DDEBUG",
793+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
793794
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
794795
.anySequence,
795796
"-swift-version", "4",
@@ -808,6 +809,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
808809
.equal(self.j),
809810
"-DSWIFT_PACKAGE",
810811
"-DDEBUG",
812+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
811813
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
812814
.anySequence,
813815
"-swift-version", "4",
@@ -1221,6 +1223,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
12211223
"-O",
12221224
.equal(self.j),
12231225
"-DSWIFT_PACKAGE",
1226+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
12241227
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
12251228
.anySequence,
12261229
"-swift-version", "4",
@@ -1315,6 +1318,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
13151318
"-O",
13161319
.equal(self.j),
13171320
"-DSWIFT_PACKAGE",
1321+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
13181322
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
13191323
.anySequence,
13201324
"-swift-version", "4",
@@ -1859,6 +1863,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
18591863
.equal(self.j),
18601864
"-DSWIFT_PACKAGE",
18611865
"-DDEBUG",
1866+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
18621867
"-Xcc",
18631868
"-fmodule-map-file=\(buildPath.appending(components: "lib.build", "module.modulemap"))",
18641869
"-Xcc", "-I", "-Xcc", "\(Pkg.appending(components: "Sources", "lib", "include"))",
@@ -2360,6 +2365,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
23602365
.equal(self.j),
23612366
"-DSWIFT_PACKAGE",
23622367
"-DDEBUG",
2368+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
23632369
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
23642370
.anySequence,
23652371
"-swift-version", "4",
@@ -2381,6 +2387,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
23812387
.equal(self.j),
23822388
"-DSWIFT_PACKAGE",
23832389
"-DDEBUG",
2390+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
23842391
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
23852392
.anySequence,
23862393
"-swift-version", "4",
@@ -2493,6 +2500,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
24932500
"-O",
24942501
.equal(self.j),
24952502
"-DSWIFT_PACKAGE",
2503+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
24962504
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
24972505
.anySequence,
24982506
"-swift-version", "4",
@@ -2857,6 +2865,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
28572865
.equal(self.j),
28582866
"-DSWIFT_PACKAGE",
28592867
"-DDEBUG",
2868+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
28602869
"-Xcc", "-fmodule-map-file=\(Clibgit.appending(components: "module.modulemap"))",
28612870
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
28622871
.anySequence,
@@ -3158,6 +3167,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
31583167
.equal(self.j),
31593168
"-DSWIFT_PACKAGE",
31603169
"-DDEBUG",
3170+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
31613171
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
31623172
.anySequence,
31633173
"-swift-version", "4",
@@ -3176,6 +3186,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
31763186
.equal(self.j),
31773187
"-DSWIFT_PACKAGE",
31783188
"-DDEBUG",
3189+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
31793190
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
31803191
.anySequence,
31813192
"-swift-version", "4",
@@ -3814,7 +3825,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
38143825
"-Onone",
38153826
"-enable-testing",
38163827
.equal(self.j),
3817-
"-DSWIFT_PACKAGE", "-DDEBUG",
3828+
"-DSWIFT_PACKAGE", "-DDEBUG", "-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
38183829
"-Xcc", "-fmodule-map-file=\(buildPath.appending(components: "lib.build", "module.modulemap"))",
38193830
"-Xcc", "-I", "-Xcc", "\(Pkg.appending(components: "Sources", "lib", "include"))",
38203831
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
@@ -5878,6 +5889,9 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
58785889
XCTAssertEqual(try barTarget.objects.map(\.pathString), [
58795890
buildPath.appending(components: "Bar.build", "Bar.swift.o").pathString,
58805891
])
5892+
5893+
XCTAssertTrue(try fooTarget.compileArguments().contains(["-DSWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE"]))
5894+
XCTAssertTrue(try barTarget.compileArguments().contains(["-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE"]))
58815895
}
58825896

58835897
func testSwiftWASIBundleAccessor() async throws {

‎Tests/BuildTests/CrossCompilationBuildPlanTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ final class CrossCompilationBuildPlanTests: XCTestCase {
179179
exe,
180180
[
181181
"-enable-batch-mode", "-Onone", "-enable-testing",
182-
"-j3", "-DSWIFT_PACKAGE", "-DDEBUG", "-Xcc",
182+
"-j3", "-DSWIFT_PACKAGE", "-DDEBUG", "-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE", "-Xcc",
183183
"-fmodule-map-file=\(buildPath.appending(components: "lib.build", "module.modulemap"))",
184184
"-Xcc", "-I", "-Xcc", "\(pkgPath.appending(components: "Sources", "lib", "include"))",
185185
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))", .anySequence,

‎Tests/XCBuildSupportTests/PIFBuilderTests.swift

+60-4
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,10 @@ final class PIFBuilderTests: XCTestCase {
542542
settings[.LIBRARY_SEARCH_PATHS],
543543
["$(inherited)", "/toolchain/lib/swift/macosx"]
544544
)
545+
XCTAssertEqual(
546+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
547+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE"]
548+
)
545549
}
546550
}
547551

@@ -567,6 +571,10 @@ final class PIFBuilderTests: XCTestCase {
567571
settings[.LIBRARY_SEARCH_PATHS],
568572
["$(inherited)", "/toolchain/lib/swift/macosx"]
569573
)
574+
XCTAssertEqual(
575+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
576+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE"]
577+
)
570578
}
571579
}
572580

@@ -671,6 +679,10 @@ final class PIFBuilderTests: XCTestCase {
671679
settings[.LIBRARY_SEARCH_PATHS],
672680
["$(inherited)", "/toolchain/lib/swift/macosx"]
673681
)
682+
XCTAssertEqual(
683+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
684+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE"]
685+
)
674686
}
675687
}
676688

@@ -690,6 +702,10 @@ final class PIFBuilderTests: XCTestCase {
690702
settings[.LIBRARY_SEARCH_PATHS],
691703
["$(inherited)", "/toolchain/lib/swift/macosx"]
692704
)
705+
XCTAssertEqual(
706+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
707+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE"]
708+
)
693709
}
694710
}
695711

@@ -877,6 +893,10 @@ final class PIFBuilderTests: XCTestCase {
877893
"$(inherited)",
878894
"/toolchain/lib/swift/macosx",
879895
])
896+
XCTAssertEqual(
897+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
898+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE"]
899+
)
880900
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
881901
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests")
882902
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests")
@@ -924,6 +944,10 @@ final class PIFBuilderTests: XCTestCase {
924944
"$(inherited)",
925945
"/toolchain/lib/swift/macosx",
926946
])
947+
XCTAssertEqual(
948+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
949+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE"]
950+
)
927951
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
928952
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests")
929953
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests")
@@ -1395,6 +1419,10 @@ final class PIFBuilderTests: XCTestCase {
13951419
XCTAssertEqual(settings[.SWIFT_OBJC_INTERFACE_HEADER_NAME], "FooLib1-Swift.h")
13961420
XCTAssertEqual(settings[.SWIFT_VERSION], "5")
13971421
XCTAssertEqual(settings[.TARGET_NAME], "FooLib1_Module")
1422+
XCTAssertEqual(
1423+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
1424+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE"]
1425+
)
13981426
}
13991427
}
14001428

@@ -1428,6 +1456,10 @@ final class PIFBuilderTests: XCTestCase {
14281456
XCTAssertEqual(settings[.SWIFT_OBJC_INTERFACE_HEADER_NAME], "FooLib1-Swift.h")
14291457
XCTAssertEqual(settings[.SWIFT_VERSION], "5")
14301458
XCTAssertEqual(settings[.TARGET_NAME], "FooLib1_Module")
1459+
XCTAssertEqual(
1460+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
1461+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE"]
1462+
)
14311463
}
14321464
}
14331465

@@ -2224,12 +2256,20 @@ final class PIFBuilderTests: XCTestCase {
22242256
target.checkBuildConfiguration("Debug") { configuration in
22252257
configuration.checkBuildSettings { settings in
22262258
XCTAssertEqual(settings[.PACKAGE_RESOURCE_BUNDLE_NAME], "Foo_foo")
2259+
XCTAssertEqual(
2260+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
2261+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE"]
2262+
)
22272263
}
22282264
}
22292265

2230-
target.checkBuildConfiguration("Debug") { configuration in
2266+
target.checkBuildConfiguration("Release") { configuration in
22312267
configuration.checkBuildSettings { settings in
22322268
XCTAssertEqual(settings[.PACKAGE_RESOURCE_BUNDLE_NAME], "Foo_foo")
2269+
XCTAssertEqual(
2270+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
2271+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE"]
2272+
)
22332273
}
22342274
}
22352275

@@ -2287,7 +2327,7 @@ final class PIFBuilderTests: XCTestCase {
22872327
}
22882328
}
22892329

2290-
target.checkBuildConfiguration("Debug") { configuration in
2330+
target.checkBuildConfiguration("Release") { configuration in
22912331
configuration.checkBuildSettings { settings in
22922332
XCTAssertEqual(settings[.PACKAGE_RESOURCE_BUNDLE_NAME], nil)
22932333
}
@@ -2305,12 +2345,20 @@ final class PIFBuilderTests: XCTestCase {
23052345
target.checkBuildConfiguration("Debug") { configuration in
23062346
configuration.checkBuildSettings { settings in
23072347
XCTAssertEqual(settings[.PACKAGE_RESOURCE_BUNDLE_NAME], "Foo_FooLib")
2348+
XCTAssertEqual(
2349+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
2350+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE"]
2351+
)
23082352
}
23092353
}
23102354

2311-
target.checkBuildConfiguration("Debug") { configuration in
2355+
target.checkBuildConfiguration("Release") { configuration in
23122356
configuration.checkBuildSettings { settings in
23132357
XCTAssertEqual(settings[.PACKAGE_RESOURCE_BUNDLE_NAME], "Foo_FooLib")
2358+
XCTAssertEqual(
2359+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
2360+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE"]
2361+
)
23142362
}
23152363
}
23162364

@@ -2326,12 +2374,20 @@ final class PIFBuilderTests: XCTestCase {
23262374
target.checkBuildConfiguration("Debug") { configuration in
23272375
configuration.checkBuildSettings { settings in
23282376
XCTAssertEqual(settings[.PACKAGE_RESOURCE_BUNDLE_NAME], "Foo_FooTests")
2377+
XCTAssertEqual(
2378+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
2379+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE"]
2380+
)
23292381
}
23302382
}
23312383

2332-
target.checkBuildConfiguration("Debug") { configuration in
2384+
target.checkBuildConfiguration("Release") { configuration in
23332385
configuration.checkBuildSettings { settings in
23342386
XCTAssertEqual(settings[.PACKAGE_RESOURCE_BUNDLE_NAME], "Foo_FooTests")
2387+
XCTAssertEqual(
2388+
settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS],
2389+
["$(inherited)", "SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE"]
2390+
)
23352391
}
23362392
}
23372393

0 commit comments

Comments
 (0)