From a20c6932d49d88ecfd4e4dfb2daea4f7a3d6821b Mon Sep 17 00:00:00 2001 From: Fraser Cormack Date: Wed, 3 Jan 2024 08:37:27 +0000 Subject: [PATCH] [host] Fix LIT tests when CA_HOST_TARGET_CPU is set The user-defined value was mistakenly passed to `lit.util.pythonize_bool` which requires it to be a bool or a string representing on/off: 'on','off','true','false', etc. Since this is not a boolean option but a string representing a CPU, there is a simpler safer way of performing this assignment. --- modules/mux/targets/host/test/lit/lit.site.cfg.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/mux/targets/host/test/lit/lit.site.cfg.in b/modules/mux/targets/host/test/lit/lit.site.cfg.in index 967109c88..f34819e2a 100644 --- a/modules/mux/targets/host/test/lit/lit.site.cfg.in +++ b/modules/mux/targets/host/test/lit/lit.site.cfg.in @@ -34,11 +34,8 @@ lit_config.load_config(config, common_lit_cfg_path) config.test_exec_root = '@CURRENT_BINARY_DIR@' -config.ca_host_target_cpu = if_enabled( - '@CA_HOST_TARGET_CPU@', - '@CA_HOST_TARGET_CPU@', - None -) +config.ca_host_target_cpu = '@CA_HOST_TARGET_CPU@' or None + config.ca_host_cl_device_name = '@host_CA_HOST_CL_DEVICE_NAME@' config.ca_host_capabilities = '@host_CAPABILITIES@'