diff options
Diffstat (limited to 'infra/bots/recipe_modules/sktest/api.py')
| -rw-r--r-- | infra/bots/recipe_modules/sktest/api.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py index 6925ade055..167683052f 100644 --- a/infra/bots/recipe_modules/sktest/api.py +++ b/infra/bots/recipe_modules/sktest/api.py @@ -543,20 +543,28 @@ def test_steps(api): env = {} env.update(api.vars.default_env) - if 'Ubuntu' in api.vars.builder_name and 'Vulkan' in api.vars.builder_name: - sdk_path = api.vars.slave_dir.join('linux_vulkan_sdk', 'bin') - lib_path = api.vars.slave_dir.join('linux_vulkan_sdk', 'lib') + if 'Ubuntu16' in api.vars.builder_name: + # The vulkan in this asset name simply means that the graphics driver + # supports Vulkan. It is also the driver used for GL code. dri_path = api.vars.slave_dir.join('linux_vulkan_intel_driver_release') if 'Debug' in api.vars.builder_name: dri_path = api.vars.slave_dir.join('linux_vulkan_intel_driver_debug') - - env.update({ - 'PATH':'%%(PATH)s:%s' % sdk_path, - 'LD_LIBRARY_PATH': lib_path, - 'LIBGL_DRIVERS_PATH':'%s' % dri_path, - 'VK_ICD_FILENAMES':'%s' % dri_path.join('intel_icd.x86_64.json'), - }) + if 'Vulkan' in api.vars.builder_name: + sdk_path = api.vars.slave_dir.join('linux_vulkan_sdk', 'bin') + lib_path = api.vars.slave_dir.join('linux_vulkan_sdk', 'lib') + env.update({ + 'PATH':'%%(PATH)s:%s' % sdk_path, + 'LD_LIBRARY_PATH': '%s:%s' % (lib_path, dri_path), + 'LIBGL_DRIVERS_PATH': dri_path, + 'VK_ICD_FILENAMES':'%s' % dri_path.join('intel_icd.x86_64.json'), + }) + else: + # Even the non-vulkan NUC jobs could benefit from the newer drivers. + env.update({ + 'LD_LIBRARY_PATH': dri_path, + 'LIBGL_DRIVERS_PATH': dri_path, + }) api.run(api.flavor.step, 'dm', cmd=args, abort_on_failure=False, |