Skip to content

Commit 44aff27

Browse files
SDGGiesbrechtSDGGiesbrecht
authored
Updated and reactivated tests. (#3870)
1 parent 409f7c8 commit 44aff27

File tree

3 files changed

+38
-16
lines changed

3 files changed

+38
-16
lines changed

‎Sources/SPMTestSupport/PIFTester.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,15 @@ public final class PIFBuildSettingsTester {
241241
}
242242
}
243243

244+
public subscript(_ key: PIF.BuildSettings.SingleValueSetting, for platform: PIF.BuildSettings.Platform) -> String? {
245+
if let value = buildSettings[key, for: platform] {
246+
buildSettings[key, for: platform] = nil
247+
return value
248+
} else {
249+
return nil
250+
}
251+
}
252+
244253
public subscript(_ key: PIF.BuildSettings.MultipleValueSetting) -> [String]? {
245254
if let value = buildSettings[key] {
246255
buildSettings[key] = nil

‎Tests/PackageModelTests/ManifestTests.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,12 @@ class ManifestTests: XCTestCase {
5454
targets: targets
5555
)
5656

57-
#if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
5857
XCTAssertEqual(manifest.targetsRequired(for: .specific(["Foo", "Bar"])).map({ $0.name }).sorted(), [
5958
"Bar",
6059
"Baz",
6160
"Foo",
6261
"MyPlugin",
6362
])
64-
#endif
6563
}
6664
}
6765

‎Tests/XCBuildSupportTests/PIFBuilderTests.swift

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,14 @@ class PIFBuilderTests: XCTestCase {
8989
XCTAssertEqual(targetAExeDependencies.map{ $0.targetGUID }, ["PACKAGE-PRODUCT:blib", "PACKAGE-TARGET:A2", "PACKAGE-TARGET:A3"])
9090
let projectBTargetNames = pif.workspace.projects[1].targets.map({ $0.name })
9191
#if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
92-
XCTAssertEqual(projectBTargetNames, ["blib", "B2"])
92+
XCTAssertEqual(projectBTargetNames, ["blib_7AE74026D_PackageProduct", "B2"])
9393
#else
9494
XCTAssertEqual(projectBTargetNames, ["bexe_7ADFD1428_PackageProduct", "blib_7AE74026D_PackageProduct", "B2"])
9595
#endif
9696
}
9797
}
9898

9999
func testProject() throws {
100-
#if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
101-
#else
102-
try XCTSkipIf(true)
103-
#endif
104-
105100
let fs = InMemoryFileSystem(emptyFiles:
106101
"/Foo/Sources/foo/main.swift",
107102
"/Foo/Tests/FooTests/tests.swift",
@@ -177,6 +172,7 @@ class PIFBuilderTests: XCTestCase {
177172
XCTAssertEqual(settings[.CODE_SIGNING_REQUIRED], "NO")
178173
XCTAssertEqual(settings[.COPY_PHASE_STRIP], "NO")
179174
XCTAssertEqual(settings[.DEBUG_INFORMATION_FORMAT], "dwarf")
175+
XCTAssertEqual(settings[.DRIVERKIT_DEPLOYMENT_TARGET], "19.0")
180176
XCTAssertEqual(settings[.DYLIB_INSTALL_NAME_BASE], "@rpath")
181177
XCTAssertEqual(settings[.ENABLE_NS_ASSERTIONS], "YES")
182178
XCTAssertEqual(settings[.ENABLE_TESTABILITY], "YES")
@@ -185,6 +181,7 @@ class PIFBuilderTests: XCTestCase {
185181
XCTAssertEqual(settings[.GCC_OPTIMIZATION_LEVEL], "0")
186182
XCTAssertEqual(settings[.GCC_PREPROCESSOR_DEFINITIONS], ["$(inherited)", "SWIFT_PACKAGE", "DEBUG=1"])
187183
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "9.0")
184+
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET, for: .macCatalyst], "13.0")
188185
XCTAssertEqual(settings[.KEEP_PRIVATE_EXTERNS], "NO")
189186
XCTAssertEqual(settings[.MACOSX_DEPLOYMENT_TARGET], "10.10")
190187
XCTAssertEqual(settings[.ONLY_ACTIVE_ARCH], "YES")
@@ -223,12 +220,14 @@ class PIFBuilderTests: XCTestCase {
223220
XCTAssertEqual(settings[.CODE_SIGNING_REQUIRED], "NO")
224221
XCTAssertEqual(settings[.COPY_PHASE_STRIP], "YES")
225222
XCTAssertEqual(settings[.DEBUG_INFORMATION_FORMAT], "dwarf-with-dsym")
223+
XCTAssertEqual(settings[.DRIVERKIT_DEPLOYMENT_TARGET], "19.0")
226224
XCTAssertEqual(settings[.DYLIB_INSTALL_NAME_BASE], "@rpath")
227225
XCTAssertEqual(settings[.ENABLE_TESTING_SEARCH_PATHS], "YES")
228226
XCTAssertEqual(settings[.ENTITLEMENTS_REQUIRED], "NO")
229227
XCTAssertEqual(settings[.GCC_OPTIMIZATION_LEVEL], "s")
230228
XCTAssertEqual(settings[.GCC_PREPROCESSOR_DEFINITIONS], ["$(inherited)", "SWIFT_PACKAGE"])
231229
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "9.0")
230+
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET, for: .macCatalyst], "13.0")
232231
XCTAssertEqual(settings[.KEEP_PRIVATE_EXTERNS], "NO")
233232
XCTAssertEqual(settings[.MACOSX_DEPLOYMENT_TARGET], "10.10")
234233
XCTAssertEqual(settings[.OTHER_LDRFLAGS], [])
@@ -275,6 +274,7 @@ class PIFBuilderTests: XCTestCase {
275274
XCTAssertEqual(settings[.CODE_SIGNING_REQUIRED], "NO")
276275
XCTAssertEqual(settings[.COPY_PHASE_STRIP], "NO")
277276
XCTAssertEqual(settings[.DEBUG_INFORMATION_FORMAT], "dwarf")
277+
XCTAssertEqual(settings[.DRIVERKIT_DEPLOYMENT_TARGET], "19.0")
278278
XCTAssertEqual(settings[.DYLIB_INSTALL_NAME_BASE], "@rpath")
279279
XCTAssertEqual(settings[.ENABLE_NS_ASSERTIONS], "YES")
280280
XCTAssertEqual(settings[.ENABLE_TESTABILITY], "YES")
@@ -283,6 +283,7 @@ class PIFBuilderTests: XCTestCase {
283283
XCTAssertEqual(settings[.GCC_OPTIMIZATION_LEVEL], "0")
284284
XCTAssertEqual(settings[.GCC_PREPROCESSOR_DEFINITIONS], ["$(inherited)", "SWIFT_PACKAGE", "DEBUG=1"])
285285
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "12.0")
286+
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET, for: .macCatalyst], "13.0")
286287
XCTAssertEqual(settings[.KEEP_PRIVATE_EXTERNS], "NO")
287288
XCTAssertEqual(settings[.MACOSX_DEPLOYMENT_TARGET], "10.14")
288289
XCTAssertEqual(settings[.ONLY_ACTIVE_ARCH], "YES")
@@ -321,12 +322,14 @@ class PIFBuilderTests: XCTestCase {
321322
XCTAssertEqual(settings[.CODE_SIGNING_REQUIRED], "NO")
322323
XCTAssertEqual(settings[.COPY_PHASE_STRIP], "YES")
323324
XCTAssertEqual(settings[.DEBUG_INFORMATION_FORMAT], "dwarf-with-dsym")
325+
XCTAssertEqual(settings[.DRIVERKIT_DEPLOYMENT_TARGET], "19.0")
324326
XCTAssertEqual(settings[.DYLIB_INSTALL_NAME_BASE], "@rpath")
325327
XCTAssertEqual(settings[.ENABLE_TESTING_SEARCH_PATHS], "YES")
326328
XCTAssertEqual(settings[.ENTITLEMENTS_REQUIRED], "NO")
327329
XCTAssertEqual(settings[.GCC_OPTIMIZATION_LEVEL], "s")
328330
XCTAssertEqual(settings[.GCC_PREPROCESSOR_DEFINITIONS], ["$(inherited)", "SWIFT_PACKAGE"])
329331
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "12.0")
332+
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET, for: .macCatalyst], "13.0")
330333
XCTAssertEqual(settings[.KEEP_PRIVATE_EXTERNS], "NO")
331334
XCTAssertEqual(settings[.MACOSX_DEPLOYMENT_TARGET], "10.14")
332335
XCTAssertEqual(settings[.OTHER_LDRFLAGS], [])
@@ -698,11 +701,6 @@ class PIFBuilderTests: XCTestCase {
698701
}
699702

700703
func testTestProducts() throws {
701-
#if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
702-
#else
703-
try XCTSkipIf(true)
704-
#endif
705-
706704
let fs = InMemoryFileSystem(emptyFiles:
707705
"/Foo/Sources/FooTests/FooTests.swift",
708706
"/Foo/Sources/CFooTests/CFooTests.m",
@@ -712,7 +710,8 @@ class PIFBuilderTests: XCTestCase {
712710
"/Bar/Sources/bar/main.swift",
713711
"/Bar/Sources/BarTests/BarTests.swift",
714712
"/Bar/Sources/CBarTests/CBarTests.m",
715-
"/Bar/Sources/BarLib/lib.swift"
713+
"/Bar/Sources/BarLib/lib.swift",
714+
inputsDir.appending(component: "Foo.pc").pathString
716715
)
717716

718717
let observability = ObservabilitySystem.makeForTesting()
@@ -779,7 +778,7 @@ class PIFBuilderTests: XCTestCase {
779778
PIFTester(pif) { workspace in
780779
workspace.checkProject("PACKAGE:/Foo") { project in
781780
project.checkTarget("PACKAGE-PRODUCT:FooTests") { target in
782-
XCTAssertEqual(target.name, "FooTests")
781+
XCTAssertEqual(target.name, "FooTests_-5E24708DC81AF5C1_PackageProduct")
783782
XCTAssertEqual(target.productType, .unitTest)
784783
XCTAssertEqual(target.productName, "FooTests")
785784
XCTAssertEqual(target.dependencies, [
@@ -809,6 +808,10 @@ class PIFBuilderTests: XCTestCase {
809808
"@loader_path/Frameworks",
810809
"@loader_path/../Frameworks"
811810
])
811+
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], [
812+
"$(inherited)",
813+
"/toolchain/lib/swift/macosx"
814+
])
812815
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
813816
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests")
814817
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests")
@@ -837,6 +840,10 @@ class PIFBuilderTests: XCTestCase {
837840
"@loader_path/Frameworks",
838841
"@loader_path/../Frameworks"
839842
])
843+
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], [
844+
"$(inherited)",
845+
"/toolchain/lib/swift/macosx"
846+
])
840847
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
841848
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests")
842849
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests")
@@ -856,7 +863,7 @@ class PIFBuilderTests: XCTestCase {
856863
}
857864

858865
project.checkTarget("PACKAGE-PRODUCT:CFooTests") { target in
859-
XCTAssertEqual(target.name, "CFooTests")
866+
XCTAssertEqual(target.name, "CFooTests_A328606A9BCFA83_PackageProduct")
860867
XCTAssertEqual(target.productType, .unitTest)
861868
XCTAssertEqual(target.productName, "CFooTests")
862869
XCTAssertEqual(target.dependencies, [])
@@ -880,6 +887,10 @@ class PIFBuilderTests: XCTestCase {
880887
"@loader_path/Frameworks",
881888
"@loader_path/../Frameworks"
882889
])
890+
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], [
891+
"$(inherited)",
892+
"/toolchain/lib/swift/macosx"
893+
])
883894
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
884895
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "CFooTests")
885896
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "CFooTests")
@@ -911,6 +922,10 @@ class PIFBuilderTests: XCTestCase {
911922
"@loader_path/Frameworks",
912923
"@loader_path/../Frameworks"
913924
])
925+
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], [
926+
"$(inherited)",
927+
"/toolchain/lib/swift/macosx"
928+
])
914929
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
915930
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "CFooTests")
916931
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "CFooTests")

0 commit comments

Comments
 (0)