Address feedback
diff --git a/compiler-rt/test/builtins/CMakeLists.txt b/compiler-rt/test/builtins/CMakeLists.txt
index 7444c16..2db38d7 100644
--- a/compiler-rt/test/builtins/CMakeLists.txt
+++ b/compiler-rt/test/builtins/CMakeLists.txt
@@ -112,6 +112,7 @@
if ("x86_64" IN_LIST COMPILER_RT_DEFAULT_TARGET_ARCH)
list(APPEND BUILTINS_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit/cpu_model)
+ list(APPEND BUILTINS_TEST_DEPS BuiltinsCPUModelUnitTests)
endif()
add_lit_testsuite(check-builtins "Running the Builtins tests"
diff --git a/compiler-rt/test/builtins/Unit/cpu_model/CMakeLists.txt b/compiler-rt/test/builtins/Unit/cpu_model/CMakeLists.txt
index 7054cee..7d4202d 100644
--- a/compiler-rt/test/builtins/Unit/cpu_model/CMakeLists.txt
+++ b/compiler-rt/test/builtins/Unit/cpu_model/CMakeLists.txt
@@ -46,7 +46,7 @@
FOLDER "Compiler-RT Runtime tests")
set(BUILTSIN_CPUMODEL_TEST_OBJECTS)
generate_compiler_rt_tests(BUILTINS_CPUMODEL_TEST_OBJECTS
- CtxProfileUnitTests "BuiltinsCPUModel-${arch}-UnitTest" ${arch}
+ BuiltinsCPUModelUnitTests "BuiltinsCPUModel-${arch}-UnitTest" ${arch}
RUNTIME ${BUILTINS_CPUMODEL_TEST_RUNTIME}
DEPS ${BUILTINS_CPUMODEL_UNITTEST_DEPS}
SOURCES ${BUILTINS_CPUMODEL_SOURCES} ${BUILTINS_CPUMODEL_UNITTESTS} ${COMPILER_RT_GTEST_SOURCE}
@@ -55,6 +55,9 @@
LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS} ${BUILTINS_CPUMODEL_UNITTEST_LINK_LIBRARIES})
endmacro()
+add_custom_target(BuiltinsCPUModelUnitTests)
+set_target_properties(BuiltinsCPUModelUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
+
set(BUILTIN_TEST_ARCH ${BUILTIN_SUPPORTED_ARCH})
# Only add the tests on x86_64 instead of looping over all the arches,
