Skip to content

Tests: use RelativePath in XcodeprojTests for path references #5514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Tests: use RelativePath in XcodeprojTests for path references #5514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Tests/XcodeprojTests/PackageGraphTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class PackageGraphTests: XCTestCase {
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_LDFLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_SWIFT_FLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.commonBuildSettings.SKIP_INSTALL, "YES")
XCTAssertEqual(targetResult.target.buildSettings.xcconfigFileRef?.path, "../Overrides.xcconfig")
XCTAssertEqual(targetResult.target.buildSettings.xcconfigFileRef?.path, RelativePath(unsafeUncheckedPath: "../Overrides.xcconfig").pathString)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

curios, why do we need to use the unsafeUncheckedPath variant?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we cannot normalize ../Overrides.xcconfig without an anchor.

XCTAssertNil(targetResult.target.buildSettings.common.SDKROOT)
}

Expand All @@ -150,7 +150,7 @@ class PackageGraphTests: XCTestCase {
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_LDFLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_SWIFT_FLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.commonBuildSettings.SKIP_INSTALL, "YES")
XCTAssertEqual(targetResult.target.buildSettings.xcconfigFileRef?.path, "../Overrides.xcconfig")
XCTAssertEqual(targetResult.target.buildSettings.xcconfigFileRef?.path, RelativePath(unsafeUncheckedPath: "../Overrides.xcconfig").pathString)
}

result.check(target: "Sea") { targetResult in
Expand All @@ -164,7 +164,7 @@ class PackageGraphTests: XCTestCase {
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_LDFLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_SWIFT_FLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.commonBuildSettings.SKIP_INSTALL, "YES")
XCTAssertEqual(targetResult.target.buildSettings.xcconfigFileRef?.path, "../Overrides.xcconfig")
XCTAssertEqual(targetResult.target.buildSettings.xcconfigFileRef?.path, RelativePath(unsafeUncheckedPath: "../Overrides.xcconfig").pathString)
}

result.check(target: "Sea2") { targetResult in
Expand All @@ -178,7 +178,7 @@ class PackageGraphTests: XCTestCase {
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_LDFLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_SWIFT_FLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.commonBuildSettings.SKIP_INSTALL, "YES")
XCTAssertEqual(targetResult.target.buildSettings.xcconfigFileRef?.path, "../Overrides.xcconfig")
XCTAssertEqual(targetResult.target.buildSettings.xcconfigFileRef?.path, RelativePath(unsafeUncheckedPath: "../Overrides.xcconfig").pathString)
}

result.check(target: "Sea3") { targetResult in
Expand All @@ -196,7 +196,7 @@ class PackageGraphTests: XCTestCase {
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_CFLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_LDFLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.commonBuildSettings.OTHER_SWIFT_FLAGS?.first, "$(inherited)")
XCTAssertEqual(targetResult.target.buildSettings.xcconfigFileRef?.path, "../Overrides.xcconfig")
XCTAssertEqual(targetResult.target.buildSettings.xcconfigFileRef?.path, RelativePath(unsafeUncheckedPath: "../Overrides.xcconfig").pathString)
}
}
}
Expand Down Expand Up @@ -285,12 +285,12 @@ class PackageGraphTests: XCTestCase {
result.check(target: "swift") { targetResult in
XCTAssertEqual(targetResult.target.buildSettings.common.OTHER_SWIFT_FLAGS ?? [], [
"$(inherited)", "-Xcc",
"-fmodule-map-file=$(SRCROOT)/Sources/Sea2/include/module.modulemap",
"-fmodule-map-file=$(SRCROOT)/\(RelativePath("Sources").appending(components: "Sea2", "include", "module.modulemap"))",
])
XCTAssertEqual(targetResult.target.buildSettings.common.HEADER_SEARCH_PATHS ?? [], [
"$(inherited)",
"$(SRCROOT)/Sources/Sea2/include",
"$(SRCROOT)/Sources/Sea/include",
"$(SRCROOT)/\(RelativePath("Sources").appending(components: "Sea2", "include"))",
"$(SRCROOT)/\(RelativePath("Sources").appending(components: "Sea", "include"))",
])
}
result.check(target: "Sea") { targetResult in
Expand Down