Skip to content

Commit fac3556

Browse files
author
Julian Lettner
committed
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
1 parent dfd805f commit fac3556

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
@@ -1020,16 +1020,16 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'w
10201020
config.target_runtime = "native"
10211021
config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
10221022

1023-
libdispatch_artifact_dir = make_path(config.libdispatch_build_path, 'src')
1023+
libdispatch_artifact_dir = config.libdispatch_build_path
1024+
libdispatch_swift_module_dir = make_path(libdispatch_artifact_dir, 'src', 'swift')
10241025
libdispatch_artifacts = [
10251026
make_path(libdispatch_artifact_dir, 'libdispatch.so'),
10261027
make_path(libdispatch_artifact_dir, 'libswiftDispatch.so'),
1027-
make_path(libdispatch_artifact_dir, 'swift', 'Dispatch.swiftmodule')]
1028+
make_path(libdispatch_swift_module_dir, 'Dispatch.swiftmodule')]
10281029
if (all(os.path.exists(p) for p in libdispatch_artifacts)):
10291030
config.available_features.add('libdispatch')
10301031
config.libdispatch_artifact_dir = libdispatch_artifact_dir
10311032
libdispatch_source_dir = make_path(config.swift_src_root, os.pardir, 'swift-corelibs-libdispatch')
1032-
libdispatch_swift_module_dir = make_path(libdispatch_artifact_dir, 'swift')
10331033
config.import_libdispatch = ('-I %s -I %s -L %s'
10341034
% (libdispatch_source_dir, libdispatch_swift_module_dir, libdispatch_artifact_dir))
10351035

0 commit comments

Comments
 (0)