Skip to content

Commit 99a8771

Browse files
committed
Revert unrelated formatting changes
1 parent d61fa1a commit 99a8771

1 file changed

Lines changed: 34 additions & 36 deletions

File tree

tools/clang/test/CMakeLists.txt

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Test runner infrastructure for Clang. This configures the Clang test trees
22
# for use by Lit, and delegates to LLVM's lit test handlers.
33

4-
if(CMAKE_CFG_INTDIR STREQUAL ".")
4+
if (CMAKE_CFG_INTDIR STREQUAL ".")
55
set(LLVM_BUILD_MODE ".")
6-
else()
6+
else ()
77
set(LLVM_BUILD_MODE "%(build_mode)s")
8-
endif()
8+
endif ()
99

1010
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
1111

@@ -14,94 +14,91 @@ set(HLSL_HEADERS_DIR ${LLVM_SOURCE_DIR}/tools/clang/lib/Headers/hlsl) # HLSL Cha
1414
configure_lit_site_cfg(
1515
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
1616
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
17-
)
17+
)
1818

1919
configure_lit_site_cfg(
2020
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
2121
${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
22-
)
22+
)
2323

2424
configure_lit_site_cfg(
2525
${CMAKE_CURRENT_SOURCE_DIR}/taef/lit.site.cfg.in
2626
${CMAKE_CURRENT_BINARY_DIR}/taef/lit.site.cfg
27-
)
27+
)
2828

2929
configure_lit_site_cfg(
3030
${CMAKE_CURRENT_SOURCE_DIR}/taef_exec/lit.site.cfg.in
3131
${CMAKE_CURRENT_BINARY_DIR}/taef_exec/lit.site.cfg
32-
)
32+
)
3333

3434
option(CLANG_TEST_USE_VG "Run Clang tests under Valgrind" OFF)
35-
3635
if(CLANG_TEST_USE_VG)
3736
set(CLANG_TEST_EXTRA_ARGS ${CLANG_TEST_EXTRA_ARGS} "--vg")
38-
endif()
37+
endif ()
3938

4039
list(APPEND CLANG_TEST_DEPS
4140
clang clang-headers
4241
clang-check clang-format
4342
c-index-test diagtool
4443
clang-tblgen
45-
)
44+
)
4645

47-
if(CLANG_ENABLE_ARCMT)
46+
if (CLANG_ENABLE_ARCMT)
4847
list(APPEND CLANG_TEST_DEPS
4948
arcmt-test
5049
c-arcmt-test
5150
)
52-
endif()
51+
endif ()
5352

54-
if(ENABLE_CLANG_EXAMPLES)
53+
if (ENABLE_CLANG_EXAMPLES)
5554
list(APPEND CLANG_TEST_DEPS
5655
clang-interpreter
5756
PrintFunctionNames
58-
)
59-
endif()
57+
)
58+
endif ()
6059

61-
if(ENABLE_CLANG_STATIC_ANALYZER AND ENABLE_CLANG_EXAMPLES)
60+
if (ENABLE_CLANG_STATIC_ANALYZER AND ENABLE_CLANG_EXAMPLES)
6261
list(APPEND CLANG_TEST_DEPS
6362
SampleAnalyzerPlugin
64-
)
65-
endif()
63+
)
64+
endif ()
6665

6766
set(CLANG_TEST_PARAMS
6867
clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
69-
)
68+
)
7069

71-
if(NOT CLANG_BUILT_STANDALONE)
70+
if( NOT CLANG_BUILT_STANDALONE )
7271
list(APPEND CLANG_TEST_DEPS
7372
llvm-config
7473
llc opt FileCheck count not llvm-symbolizer llvm-profdata llvm-objdump
75-
)
74+
)
7675
endif()
7776

7877
# HLSL Change Begin
7978
# Explicitly overriding check-clang dependencies for HLSL
8079
set(CLANG_TEST_DEPS dxc dxa dxopt dxl dxv dxr dxcompiler clang-tblgen llvm-config opt FileCheck count not ClangUnitTests)
81-
82-
if(WIN32)
83-
list(APPEND CLANG_TEST_DEPS
84-
dxc_batch ExecHLSLTests dxildll
85-
)
80+
if (WIN32)
81+
list(APPEND CLANG_TEST_DEPS
82+
dxc_batch ExecHLSLTests dxildll
83+
)
8684
else()
87-
list(APPEND CLANG_TEST_DEPS
88-
dxildll
89-
)
85+
list(APPEND CLANG_TEST_DEPS
86+
dxildll
87+
)
9088
endif()
91-
9289
add_custom_target(clang-test-depends DEPENDS ${CLANG_TEST_DEPS})
9390
set_target_properties(clang-test-depends PROPERTIES FOLDER "Clang tests")
94-
9591
# HLSL Change End
92+
93+
9694
add_lit_testsuite(check-clang "Running the Clang regression tests"
9795
${CMAKE_CURRENT_BINARY_DIR}
98-
99-
# LIT ${LLVM_LIT}
96+
#LIT ${LLVM_LIT}
10097
PARAMS ${CLANG_TEST_PARAMS}
101-
skip_taef_exec=False
98+
skip_taef_exec=False
10299
DEPENDS ${CLANG_TEST_DEPS}
103100
ARGS ${CLANG_TEST_EXTRA_ARGS}
104-
)
101+
)
105102
set_target_properties(check-clang PROPERTIES FOLDER "Clang tests")
106103

107104
# Add a legacy target spelling: clang-test
@@ -110,13 +107,14 @@ add_dependencies(clang-test check-clang)
110107
set_target_properties(clang-test PROPERTIES FOLDER "Clang tests")
111108

112109
# HLSL Change Begin - Generate lit targets for test subdirectories.
110+
113111
set(CLANG_TEST_PARAMS
114112
${CLANG_TEST_PARAMS}
115113
clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
116114
clang_taef_site_config=${CMAKE_CURRENT_BINARY_DIR}/taef/lit.site.cfg
117115
no_priority=True
118116
clang_taef_exec_site_config=${CMAKE_CURRENT_BINARY_DIR}/taef_exec/lit.site.cfg
119-
)
117+
)
120118

121119
add_lit_testsuites(CLANG ${CMAKE_CURRENT_SOURCE_DIR}
122120
PARAMS ${CLANG_TEST_PARAMS}

0 commit comments

Comments
 (0)