Skip to content

Commit 631305f

Browse files
authored
Reactivate libdispatch tests on Linux (#27940)
* Reactivate libdispatch tests on Linux The swift-corelibs-libdispatch project had its build directory layout changed [1] which silently deactivated the libdispatch tests on Linux, because we use hard-coded paths to look for the required libdispatch artifacts. This change adapts the paths to the new layout. Thanks to Jordan Rose for noticing and diagnosing this [2]. SR-11568 [2] https://bugs.swift.org/browse/SR-11568 [1] swiftlang/swift-corelibs-libdispatch#515 * Fix libdispatch Swift module directory
1 parent 4d923ad commit 631305f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/lit.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,16 +1024,16 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'w
10241024
config.target_runtime = "native"
10251025
config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
10261026

1027-
libdispatch_artifact_dir = make_path(config.libdispatch_build_path, 'src')
1027+
libdispatch_artifact_dir = config.libdispatch_build_path
1028+
libdispatch_swift_module_dir = make_path(libdispatch_artifact_dir, 'src', 'swift', 'swift')
10281029
libdispatch_artifacts = [
10291030
make_path(libdispatch_artifact_dir, 'libdispatch.so'),
10301031
make_path(libdispatch_artifact_dir, 'libswiftDispatch.so'),
1031-
make_path(libdispatch_artifact_dir, 'swift', 'Dispatch.swiftmodule')]
1032+
make_path(libdispatch_swift_module_dir, 'Dispatch.swiftmodule')]
10321033
if (all(os.path.exists(p) for p in libdispatch_artifacts)):
10331034
config.available_features.add('libdispatch')
10341035
config.libdispatch_artifact_dir = libdispatch_artifact_dir
10351036
libdispatch_source_dir = make_path(config.swift_src_root, os.pardir, 'swift-corelibs-libdispatch')
1036-
libdispatch_swift_module_dir = make_path(libdispatch_artifact_dir, 'swift')
10371037
config.import_libdispatch = ('-I %s -I %s -L %s'
10381038
% (libdispatch_source_dir, libdispatch_swift_module_dir, libdispatch_artifact_dir))
10391039

0 commit comments

Comments
 (0)