From 41f88a9ac5afd3ce5ab00420419696ebc2d7fd32 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Wed, 14 Feb 2024 00:36:14 +0000 Subject: [PATCH] In run_tests, use the regular path to the Vulkan library if lib.unstripped does not exist lib.unstripped will not be created in a "gn --no-stripped" build See https://github.com/flutter/engine/pull/50443 --- testing/run_tests.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/testing/run_tests.py b/testing/run_tests.py index bd3712d63f339..d8ed85cd8450f 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -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