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 @@ -1022,6 +1022,13 @@ extension PackagePIFProjectBuilder {
1022
1022
// This should eventually be set universally for all package targets/products.
1023
1023
settings [ . LINKER_DRIVER] = " swiftc "
1024
1024
1025
+ // A test-runner should always be adjacent to the dynamic library containing the tests,
1026
+ // so add the appropriate rpaths.
1027
+ settings [ . LD_RUNPATH_SEARCH_PATHS] = [
1028
+ " $(inherited) " ,
1029
+ " $(RPATH_ORIGIN) "
1030
+ ]
1031
+
1025
1032
let deploymentTargets = unitTestProduct. deploymentTargets
1026
1033
settings [ . MACOSX_DEPLOYMENT_TARGET] = deploymentTargets ? [ . macOS] ?? nil
1027
1034
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