Skip to content

Add rpath to test runner binaries to find adjacent test dylib #9218

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

Add rpath to test runner binaries to find adjacent test dylib #9218

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Products.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,6 +1022,13 @@ extension PackagePIFProjectBuilder {
// This should eventually be set universally for all package targets/products.
settings[.LINKER_DRIVER] = "swiftc"

// A test-runner should always be adjacent to the dynamic library containing the tests,
// so add the appropriate rpaths.
settings[.LD_RUNPATH_SEARCH_PATHS] = [
"$(inherited)",
"$(RPATH_ORIGIN)"
]

let deploymentTargets = unitTestProduct.deploymentTargets
settings[.MACOSX_DEPLOYMENT_TARGET] = deploymentTargets?[.macOS] ?? nil
settings[.IPHONEOS_DEPLOYMENT_TARGET] = deploymentTargets?[.iOS] ?? nil
Expand Down
5 changes: 2 additions & 3 deletions Tests/CommandsTests/TestCommandTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,8 +663,7 @@ struct TestCommandTests {
}
}
} when: {
(buildSystem == .swiftbuild && .linux == ProcessInfo.hostOperatingSystem)
|| ProcessInfo.hostOperatingSystem == .windows
ProcessInfo.hostOperatingSystem == .windows
}
}

Expand Down Expand Up @@ -1011,7 +1010,7 @@ struct TestCommandTests {
)
}
} when: {
buildSystem == .swiftbuild && ProcessInfo.hostOperatingSystem != .macOS
buildSystem == .swiftbuild && ProcessInfo.hostOperatingSystem == .windows
}
}

Expand Down