Skip to content

Commit 2f6da0f

Browse files
authored
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.
1 parent 8ee6ed1 commit 2f6da0f

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

tools/clang/test/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ configure_lit_site_cfg(
2020
)
2121

2222
configure_lit_site_cfg(
23-
${CMAKE_CURRENT_SOURCE_DIR}/clang-hlsl/lit.site.cfg.in
24-
${CMAKE_CURRENT_BINARY_DIR}/clang-hlsl/lit.site.cfg
23+
${CMAKE_CURRENT_SOURCE_DIR}/taef/lit.site.cfg.in
24+
${CMAKE_CURRENT_BINARY_DIR}/taef/lit.site.cfg
2525
)
2626

2727
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"
100100

101101
# HLSL Change Begin - Add taef tests
102102
if (WIN32)
103-
add_lit_target("check-hlsl" "Running lit suite hlsl"
104-
${CMAKE_CURRENT_SOURCE_DIR}/clang-hlsl
103+
add_lit_target("check-clang-taef" "Running lit suite hlsl"
104+
${CMAKE_CURRENT_SOURCE_DIR}/taef
105105
PARAMS ${CLANG_TEST_PARAMS}
106-
clang_hlsl_site_config=${CMAKE_CURRENT_BINARY_DIR}/clang-hlsl/lit.site.cfg
107-
DEPENDS clang-hlsl-tests
106+
clang_taef_site_config=${CMAKE_CURRENT_BINARY_DIR}/taef/lit.site.cfg
107+
DEPENDS ClangHLSLTests
108108
ARGS ${CLANG_TEST_EXTRA_ARGS}
109109
)
110110
endif()
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Configuration file for the 'lit' test runner.
44

55
import os
6+
import platform
67

78
import lit.formats
89
import lit.util
@@ -19,7 +20,7 @@ if llvm_obj_root is None:
1920
# out-of-tree build situation).
2021

2122
# Check for 'clang_unit_site_config' user parameter, and use that if available.
22-
site_cfg = lit_config.params.get('clang_hlsl_site_config', None)
23+
site_cfg = lit_config.params.get('clang_taef_site_config', None)
2324
if site_cfg and os.path.exists(site_cfg):
2425
lit_config.load_config(config, site_cfg)
2526
raise SystemExit
File renamed without changes.

0 commit comments

Comments
 (0)