Skip to content
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

[sanitizer][test] Unify LD_LIBRARY_PATH handling #111498

Merged
merged 2 commits into from
Oct 15, 2024
Merged

[sanitizer][test] Unify LD_LIBRARY_PATH handling #111498

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f35de6
[sanitizer][test] Unify LD_LIBRARY_PATH handling
rorth Oct 8, 2024
a853134
Fix python format.
rorth Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions compiler-rt/test/asan/Unit/lit.site.cfg.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,6 @@ import shlex
# Load common config for all compiler-rt unit tests.
lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")

def push_ld_library_path(config, new_path):
new_ld_library_path = os.path.pathsep.join(
(new_path, config.environment.get('LD_LIBRARY_PATH', '')))
config.environment['LD_LIBRARY_PATH'] = new_ld_library_path

if platform.system() == 'FreeBSD':
new_ld_32_library_path = os.path.pathsep.join(
(new_path, config.environment.get('LD_32_LIBRARY_PATH', '')))
config.environment['LD_32_LIBRARY_PATH'] = new_ld_32_library_path

if platform.system() == 'SunOS':
new_ld_library_path_32 = os.path.pathsep.join(
(new_path, config.environment.get('LD_LIBRARY_PATH_32', '')))
config.environment['LD_LIBRARY_PATH_32'] = new_ld_library_path_32

new_ld_library_path_64 = os.path.pathsep.join(
(new_path, config.environment.get('LD_LIBRARY_PATH_64', '')))
config.environment['LD_LIBRARY_PATH_64'] = new_ld_library_path_64

# Setup config name.
config.name = 'AddressSanitizer-Unit'

Expand All @@ -48,19 +29,5 @@ config.test_exec_root = os.path.join("@COMPILER_RT_BINARY_DIR@",

config.test_source_root = config.test_exec_root

# When LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=on, the initial value of
# config.compiler_rt_libdir (COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR) has the
# host triple as the trailing path component. The value is incorrect for i386
# tests on x86_64 hosts and vice versa. Adjust config.compiler_rt_libdir
# accordingly.
if config.enable_per_target_runtime_dir:
if config.target_arch == 'i386':
config.compiler_rt_libdir = re.sub(r'/x86_64(?=-[^/]+$)', '/i386', config.compiler_rt_libdir)
elif config.target_arch == 'x86_64':
config.compiler_rt_libdir = re.sub(r'/i386(?=-[^/]+$)', '/x86_64', config.compiler_rt_libdir)

# Set LD_LIBRARY_PATH to pick dynamic runtime up properly.
push_ld_library_path(config, config.compiler_rt_libdir)

if not config.parallelism_group:
config.parallelism_group = 'shadow-memory'
22 changes: 11 additions & 11 deletions compiler-rt/test/lit.common.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,18 +161,18 @@ def push_dynamic_library_lookup_path(config, new_path):

# When LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=on, the initial value of
# config.compiler_rt_libdir (COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR) has the
# triple as the trailing path component. The value is incorrect for -m32/-m64.
# Adjust config.compiler_rt accordingly.
# host triple as the trailing path component. The value is incorrect for 32-bit
# tests on 64-bit hosts and vice versa. Adjust config.compiler_rt_libdir
# accordingly.
if config.enable_per_target_runtime_dir:
if "-m32" in shlex.split(config.target_cflags):
config.compiler_rt_libdir = re.sub(
r"/x86_64(?=-[^/]+$)", "/i386", config.compiler_rt_libdir
)
elif "-m64" in shlex.split(config.target_cflags):
config.compiler_rt_libdir = re.sub(
r"/i386(?=-[^/]+$)", "/x86_64", config.compiler_rt_libdir
)

if config.target_arch == 'i386':
config.compiler_rt_libdir = re.sub(r'/x86_64(?=-[^/]+$)', '/i386', config.compiler_rt_libdir)
elif config.target_arch == 'x86_64':
config.compiler_rt_libdir = re.sub(r'/i386(?=-[^/]+$)', '/x86_64', config.compiler_rt_libdir)
if config.target_arch == 'sparc':
config.compiler_rt_libdir = re.sub(r'/sparcv9(?=-[^/]+$)', '/sparc', config.compiler_rt_libdir)
elif config.target_arch == 'sparcv9':
config.compiler_rt_libdir = re.sub(r'/sparc(?=-[^/]+$)', '/sparcv9', config.compiler_rt_libdir)

# Check if the test compiler resource dir matches the local build directory
# (which happens with -DLLVM_ENABLE_PROJECTS=clang;compiler-rt) or if we are
Expand Down
Loading