Skip to content

lit.cfg: move the DYLD_LIBRARY_PATH setting code to the config.substitutions #23996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2019
Merged

lit.cfg: move the DYLD_LIBRARY_PATH setting code to the config.substitutions #23996

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 41 additions & 40 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,47 @@ if platform.system() != 'Darwin':
config.target_resilience_test = ('%s --no-symbol-diff' %
config.target_resilience_test)

platform_module_dir = make_path(test_resource_dir, config.target_sdk_name)
if run_vendor != 'apple':
platform_module_dir = make_path(platform_module_dir, run_cpu)
lit_config.note('Using platform module dir: ' + platform_module_dir)
if test_sdk_overlay_dir:
platform_sdk_overlay_dir = test_sdk_overlay_dir
else:
platform_sdk_overlay_dir = platform_module_dir

# If static stdlib is present, enable static stdlib tests
static_stdlib_path = make_path(config.swift_lib_dir, "swift_static", config.target_sdk_name)
static_libswiftCore_path = make_path(static_stdlib_path, "libswiftCore.a")
if os.path.exists(static_libswiftCore_path):
config.available_features.add("static_stdlib")
config.substitutions.append(('%target-static-stdlib-path', static_stdlib_path))
lit_config.note('using static stdlib path: %s' % static_stdlib_path)

# Set up testing with the standard libraries coming from the OS / just-built libraries
# default Swift tests to use the just-built libraries
target_stdlib_path = platform_module_dir
if not kIsWindows:
if 'use_os_stdlib' not in lit_config.params:
lit_config.note('Testing with the just-built libraries at ' + target_stdlib_path)
config.target_run = (
"/usr/bin/env "
"DYLD_LIBRARY_PATH='{0}' " # Apple option
"LD_LIBRARY_PATH='{0}' " # Linux option
.format(target_stdlib_path))
else:
os_stdlib_path = ''
if run_vendor == 'apple':
#If we get swift-in-the-OS for non-Apple platforms, add a condition here
os_stdlib_path = "/usr/lib/swift"
all_stdlib_path = os.path.pathsep.join((os_stdlib_path, target_stdlib_path))
lit_config.note('Testing with the standard libraries coming from the OS ' + all_stdlib_path)
config.target_run = (
"/usr/bin/env "
"DYLD_LIBRARY_PATH='{0}' " # Apple option
"LD_LIBRARY_PATH='{0}' " # Linux option
.format(all_stdlib_path))

#
# When changing substitutions, update docs/Testing.rst.
#
Expand Down Expand Up @@ -1416,15 +1457,6 @@ if hasattr(config, 'target_swift_autolink_extract'):
config.substitutions.append(('%target-swift-modulewrap',
config.target_swift_modulewrap))

platform_module_dir = make_path(test_resource_dir, config.target_sdk_name)
if run_vendor != 'apple':
platform_module_dir = make_path(platform_module_dir, run_cpu)
lit_config.note('Using platform module dir: ' + platform_module_dir)
if test_sdk_overlay_dir:
platform_sdk_overlay_dir = test_sdk_overlay_dir
else:
platform_sdk_overlay_dir = platform_module_dir

config.substitutions.insert(0, ('%platform-module-dir', platform_module_dir))
config.substitutions.insert(0, ('%platform-sdk-overlay-dir', platform_sdk_overlay_dir))

Expand Down Expand Up @@ -1459,37 +1491,6 @@ config.substitutions.append(('%FileCheck',
'--enable-windows-compatibility' if kIsWindows else '')))
config.substitutions.append(('%raw-FileCheck', pipes.quote(config.filecheck)))

# If static stdlib is present, enable static stdlib tests
static_stdlib_path = make_path(config.swift_lib_dir, "swift_static", config.target_sdk_name)
libswiftCore_path = make_path(static_stdlib_path, "libswiftCore.a")
if os.path.exists(libswiftCore_path):
config.available_features.add("static_stdlib")
config.substitutions.append(('%target-static-stdlib-path', static_stdlib_path))
lit_config.note('using static stdlib path: %s' % static_stdlib_path)

# Set up testing with the standard libraries coming from the OS / just-built libraries
# default Swift tests to use the just-built libraries
target_stdlib_path = platform_module_dir
if 'use_os_stdlib' not in lit_config.params:
lit_config.note('Testing with the just-built libraries at ' + target_stdlib_path)
config.target_run = (
"/usr/bin/env "
"DYLD_LIBRARY_PATH='{0}' " # Apple option
"LD_LIBRARY_PATH='{0}' " # Linux option
.format(target_stdlib_path))
else:
os_stdlib_path = ''
if run_vendor == 'apple':
#If we get swift-in-the-OS for non-Apple platforms, add a condition here
os_stdlib_path = "/usr/lib/swift"
all_stdlib_path = os.path.pathsep.join((os_stdlib_path, target_stdlib_path))
lit_config.note('Testing with the standard libraries coming from the OS ' + all_stdlib_path)
config.target_run = (
"/usr/bin/env "
"DYLD_LIBRARY_PATH='{0}' " # Apple option
"LD_LIBRARY_PATH='{0}' " # Linux option
.format(all_stdlib_path))

if config.lldb_build_root != "":
config.available_features.add('lldb')
# Note: using the same approach to locating the lib dir as in
Expand Down