Make clang taef lit config conform to conventions (#4809)

The new taef lit configuration names don't conform to the normal
conventions which makes it difficult for them to have automatically
generated targets. This updates them to match LLVM & Clang conventions.
This commit is contained in:
Chris B 2022-11-22 15:32:18 -06:00 коммит произвёл GitHub
Родитель 8ee6ed19f3
Коммит 2f6da0f2ef
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 8 добавлений и 7 удалений

Просмотреть файл

@ -20,8 +20,8 @@ configure_lit_site_cfg(
)
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/clang-hlsl/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/clang-hlsl/lit.site.cfg
${CMAKE_CURRENT_SOURCE_DIR}/taef/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/taef/lit.site.cfg
)
option(CLANG_TEST_USE_VG "Run Clang tests under Valgrind" OFF)
@ -100,11 +100,11 @@ add_lit_target("check-clang-unit" "Running lit suite clang-unit"
# HLSL Change Begin - Add taef tests
if (WIN32)
add_lit_target("check-hlsl" "Running lit suite hlsl"
${CMAKE_CURRENT_SOURCE_DIR}/clang-hlsl
add_lit_target("check-clang-taef" "Running lit suite hlsl"
${CMAKE_CURRENT_SOURCE_DIR}/taef
PARAMS ${CLANG_TEST_PARAMS}
clang_hlsl_site_config=${CMAKE_CURRENT_BINARY_DIR}/clang-hlsl/lit.site.cfg
DEPENDS clang-hlsl-tests
clang_taef_site_config=${CMAKE_CURRENT_BINARY_DIR}/taef/lit.site.cfg
DEPENDS ClangHLSLTests
ARGS ${CLANG_TEST_EXTRA_ARGS}
)
endif()

Просмотреть файл

@ -3,6 +3,7 @@
# Configuration file for the 'lit' test runner.
import os
import platform
import lit.formats
import lit.util
@ -19,7 +20,7 @@ if llvm_obj_root is None:
# out-of-tree build situation).
# Check for 'clang_unit_site_config' user parameter, and use that if available.
site_cfg = lit_config.params.get('clang_hlsl_site_config', None)
site_cfg = lit_config.params.get('clang_taef_site_config', None)
if site_cfg and os.path.exists(site_cfg):
lit_config.load_config(config, site_cfg)
raise SystemExit