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.

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

In run_tests, use the regular path to the Vulkan library if lib.unstripped does not exist #50629

Merged
Merged
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions testing/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,13 @@ def run_engine_executable( # pylint: disable=too-many-arguments
env['LD_LIBRARY_PATH'] = build_dir
env['VK_DRIVER_FILES'] = os.path.join(build_dir, 'vk_swiftshader_icd.json')
if os.path.exists(unstripped_exe):
unstripped_vulkan = os.path.join(build_dir, 'lib.unstripped', 'libvulkan.so.1')
if os.path.exists(unstripped_vulkan):
vulkan_path = unstripped_vulkan
else:
vulkan_path = os.path.join(build_dir, 'libvulkan.so.1')
try:
os.symlink(
os.path.join(build_dir, 'lib.unstripped', 'libvulkan.so.1'),
os.path.join(build_dir, 'exe.unstripped', 'libvulkan.so.1')
)
os.symlink(vulkan_path, os.path.join(build_dir, 'exe.unstripped', 'libvulkan.so.1'))
except OSError as err:
if err.errno == errno.EEXIST:
pass
Expand Down