Skip to content

Commit 84a32c0

Browse files
finagolfingottesmm
authored andcommitted
[test] Add new libdispatch -vfsoverlay flag for linux, as in swiftlang/swift-corelibs-libdispatch#785
This allows the tests that use libdispatch to find its modulemap, plus add the libdispatch compilation flags to one test that was missing them.
1 parent 0132841 commit 84a32c0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

test/Concurrency/Runtime/custom_executors_complex_equality_crash.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library)
1+
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library)
22

33
// REQUIRES: concurrency
44
// REQUIRES: executable_test

test/lit.cfg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,15 +1643,17 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
16431643
libdispatch_artifact_dir = config.libdispatch_build_path
16441644
libdispatch_swift_module_dir = make_path(libdispatch_artifact_dir, 'src', 'swift', 'swift')
16451645
libdispatch_source_dir = make_path(config.swift_src_root, os.pardir, 'swift-corelibs-libdispatch')
1646+
libdispatch_vfs_yaml = make_path(libdispatch_artifact_dir, 'dispatch-vfs-overlay.yaml')
16461647
libdispatch_artifacts = [
1648+
libdispatch_vfs_yaml,
16471649
make_path(libdispatch_artifact_dir, 'libdispatch.so'),
16481650
make_path(libdispatch_artifact_dir, 'libswiftDispatch.so'),
16491651
make_path(libdispatch_swift_module_dir, 'Dispatch.swiftmodule')]
16501652
if (all(os.path.exists(p) for p in libdispatch_artifacts)):
16511653
config.available_features.add('libdispatch')
16521654
config.libdispatch_artifact_dir = libdispatch_artifact_dir
1653-
config.import_libdispatch = ('-I %s -I %s -L %s'
1654-
% (libdispatch_source_dir, libdispatch_swift_module_dir, libdispatch_artifact_dir))
1655+
config.import_libdispatch = ('-I %s -I %s -L %s -vfsoverlay %s'
1656+
% (libdispatch_source_dir, libdispatch_swift_module_dir, libdispatch_artifact_dir, libdispatch_vfs_yaml))
16551657

16561658
libdispatch_static_artifact_dir = os.path.join(config.libdispatch_static_build_path, 'lib')
16571659
libdispatch_static_artifacts = [

0 commit comments

Comments
 (0)