From a7e39bf6c451b522871f1e8ad21d2155de77bdb2 Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman@google.com>
Date: Wed, 18 Sep 2024 23:15:24 +0000
Subject: Address feedback

---
 compiler-rt/test/builtins/CMakeLists.txt                | 1 +
 compiler-rt/test/builtins/Unit/cpu_model/CMakeLists.txt | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/compiler-rt/test/builtins/CMakeLists.txt b/compiler-rt/test/builtins/CMakeLists.txt
index 7444c163cf2c..2db38d7fe292 100644
--- a/compiler-rt/test/builtins/CMakeLists.txt
+++ b/compiler-rt/test/builtins/CMakeLists.txt
@@ -112,6 +112,7 @@ endforeach()
 
 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 7054ceec317e..7d4202d8b8da 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 @@ macro (add_builtins_cpumodel_tests_for_arch arch)
     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 @@ macro (add_builtins_cpumodel_tests_for_arch arch)
     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,
-- 
cgit v1.2.3