[NFC][CFI] Fix setup of UBSAN_TEST_HAS_CFI

[vitalybuka]

For #137245

[llvmbot]

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Vitaly Buka (vitalybuka)

Changes

For #137245

---

Full diff: https://github.com/llvm/llvm-project/pull/137424.diff

2 Files Affected:

• (modified) compiler-rt/test/ubsan_minimal/CMakeLists.txt (+5-1)
• (modified) compiler-rt/test/ubsan_minimal/lit.site.cfg.py.in (+1-1)

diff --git a/compiler-rt/test/ubsan_minimal/CMakeLists.txt b/compiler-rt/test/ubsan_minimal/CMakeLists.txt
index 819428c6e80d9..5b722a15e9827 100644
--- a/compiler-rt/test/ubsan_minimal/CMakeLists.txt
+++ b/compiler-rt/test/ubsan_minimal/CMakeLists.txt
@@ -13,7 +13,11 @@ foreach(arch ${UBSAN_TEST_ARCH})
   string(TOLOWER "-${arch}-${OS_NAME}" UBSAN_TEST_CONFIG_SUFFIX)
   get_test_cc_for_arch(${arch} UBSAN_TEST_TARGET_CC UBSAN_TEST_TARGET_CFLAGS)
   set(CONFIG_NAME ${arch})
-  set(UBSAN_TEST_HAS_CFI ${arch} IN_LIST CFI_SUPPORTED_ARCH)
+  if(${arch} IN_LIST CFI_SUPPORTED_ARCH)
+    set(UBSAN_TEST_HAS_CFI TRUE)
+  else()
+    set(UBSAN_TEST_HAS_CFI FALSE)
+  endif()
   pythonize_bool(UBSAN_TEST_HAS_CFI)
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
diff --git a/compiler-rt/test/ubsan_minimal/lit.site.cfg.py.in b/compiler-rt/test/ubsan_minimal/lit.site.cfg.py.in
index 457ddff867b84..8400af6ff5a81 100644
--- a/compiler-rt/test/ubsan_minimal/lit.site.cfg.py.in
+++ b/compiler-rt/test/ubsan_minimal/lit.site.cfg.py.in
@@ -5,7 +5,7 @@ config.name_suffix = "@UBSAN_TEST_CONFIG_SUFFIX@"
 # Tool-specific config options.
 config.target_cflags = "@UBSAN_TEST_TARGET_CFLAGS@"
 config.target_arch = "@UBSAN_TEST_TARGET_ARCH@"
-config.test_cfi = "@UBSAN_TEST_HAS_CFI_PYBOOL@"
+config.test_cfi = @UBSAN_TEST_HAS_CFI_PYBOOL@
 
 # Load common config for all compiler-rt lit tests.
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")