File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed
Sources/SwiftBuildSupport Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -1012,6 +1012,13 @@ extension PackagePIFProjectBuilder {
1012
1012
// This should eventually be set universally for all package targets/products.
1013
1013
settings [ . LINKER_DRIVER] = " swiftc "
1014
1014
1015
+ // A test-runner should always be adjacent to the dynamic library containing the tests,
1016
+ // so add the appropriate rpaths.
1017
+ settings [ . LD_RUNPATH_SEARCH_PATHS] = [
1018
+ " $(inherited) " ,
1019
+ " $(RPATH_ORIGIN) "
1020
+ ]
1021
+
1015
1022
let deploymentTargets = unitTestProduct. deploymentTargets
1016
1023
settings [ . MACOSX_DEPLOYMENT_TARGET] = deploymentTargets ? [ . macOS] ?? nil
1017
1024
settings [ . IPHONEOS_DEPLOYMENT_TARGET] = deploymentTargets ? [ . iOS] ?? nil
Original file line number Diff line number Diff line change @@ -663,8 +663,7 @@ struct TestCommandTests {
663
663
}
664
664
}
665
665
} when: {
666
- ( buildSystem == . swiftbuild && . linux == ProcessInfo . hostOperatingSystem)
667
- || ProcessInfo . hostOperatingSystem == . windows
666
+ ProcessInfo . hostOperatingSystem == . windows
668
667
}
669
668
}
670
669
@@ -1011,7 +1010,7 @@ struct TestCommandTests {
1011
1010
)
1012
1011
}
1013
1012
} when: {
1014
- buildSystem == . swiftbuild && ProcessInfo . hostOperatingSystem != . macOS
1013
+ buildSystem == . swiftbuild && ProcessInfo . hostOperatingSystem == . windows
1015
1014
}
1016
1015
}
1017
1016
You can’t perform that action at this time.
0 commit comments