Skip to content

Commit c052c54

Browse files
matthewseamanmatthewseaman
committed
Update unit tests
1 parent 5b8637d commit c052c54

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
@@ -792,6 +792,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
792792
.equal(self.j),
793793
"-DSWIFT_PACKAGE",
794794
"-DDEBUG",
795+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
795796
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
796797
.anySequence,
797798
"-swift-version", "4",
@@ -811,6 +812,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
811812
.equal(self.j),
812813
"-DSWIFT_PACKAGE",
813814
"-DDEBUG",
815+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
814816
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
815817
.anySequence,
816818
"-swift-version", "4",
@@ -1224,6 +1226,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
12241226
"-O",
12251227
.equal(self.j),
12261228
"-DSWIFT_PACKAGE",
1229+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
12271230
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
12281231
.anySequence,
12291232
"-swift-version", "4",
@@ -1318,6 +1321,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
13181321
"-O",
13191322
.equal(self.j),
13201323
"-DSWIFT_PACKAGE",
1324+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
13211325
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
13221326
.anySequence,
13231327
"-swift-version", "4",
@@ -1863,6 +1867,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
18631867
.equal(self.j),
18641868
"-DSWIFT_PACKAGE",
18651869
"-DDEBUG",
1870+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
18661871
"-Xcc",
18671872
"-fmodule-map-file=\(buildPath.appending(components: "lib.build", "module.modulemap"))",
18681873
"-Xcc", "-I", "-Xcc", "\(Pkg.appending(components: "Sources", "lib", "include"))",
@@ -2365,6 +2370,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
23652370
.equal(self.j),
23662371
"-DSWIFT_PACKAGE",
23672372
"-DDEBUG",
2373+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
23682374
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
23692375
.anySequence,
23702376
"-swift-version", "4",
@@ -2387,6 +2393,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
23872393
.equal(self.j),
23882394
"-DSWIFT_PACKAGE",
23892395
"-DDEBUG",
2396+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
23902397
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
23912398
.anySequence,
23922399
"-swift-version", "4",
@@ -2499,6 +2506,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
24992506
"-O",
25002507
.equal(self.j),
25012508
"-DSWIFT_PACKAGE",
2509+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
25022510
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
25032511
.anySequence,
25042512
"-swift-version", "4",
@@ -2864,6 +2872,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
28642872
.equal(self.j),
28652873
"-DSWIFT_PACKAGE",
28662874
"-DDEBUG",
2875+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
28672876
"-Xcc", "-fmodule-map-file=\(Clibgit.appending(components: "module.modulemap"))",
28682877
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
28692878
.anySequence,
@@ -3166,6 +3175,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
31663175
.equal(self.j),
31673176
"-DSWIFT_PACKAGE",
31683177
"-DDEBUG",
3178+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
31693179
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
31703180
.anySequence,
31713181
"-swift-version", "4",
@@ -3185,6 +3195,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
31853195
.equal(self.j),
31863196
"-DSWIFT_PACKAGE",
31873197
"-DDEBUG",
3198+
"-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
31883199
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
31893200
.anySequence,
31903201
"-swift-version", "4",
@@ -3824,7 +3835,7 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
38243835
"-Onone",
38253836
"-enable-testing",
38263837
.equal(self.j),
3827-
"-DSWIFT_PACKAGE", "-DDEBUG",
3838+
"-DSWIFT_PACKAGE", "-DDEBUG", "-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE",
38283839
"-Xcc", "-fmodule-map-file=\(buildPath.appending(components: "lib.build", "module.modulemap"))",
38293840
"-Xcc", "-I", "-Xcc", "\(Pkg.appending(components: "Sources", "lib", "include"))",
38303841
"-module-cache-path", "\(buildPath.appending(components: "ModuleCache"))",
@@ -5888,6 +5899,9 @@ class BuildPlanTestCase: BuildSystemProviderTestCase {
58885899
XCTAssertEqual(try barTarget.objects.map(\.pathString), [
58895900
buildPath.appending(components: "Bar.build", "Bar.swift.o").pathString,
58905901
])
5902+
5903+
XCTAssertTrue(try fooTarget.compileArguments().contains(["-DSWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE"]))
5904+
XCTAssertTrue(try barTarget.compileArguments().contains(["-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE"]))
58915905
}
58925906

58935907
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", "-serialize-diagnostics", "-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)