From 0d0a42b5bcf349b63edc171a8c9365834a1b562a Mon Sep 17 00:00:00 2001
From: Dana Robinson <Dana.Robinson@amd.com>
Date: Sat, 1 Nov 2025 09:58:32 -0600
Subject: [PATCH] Relocate magic-word.cpp/h

Makes it more obvious that magic-word.cpp/h is only for testing.
Also aligns hipFile and rocFile test CMake.
---
 hipfile/test/CMakeLists.txt      |  7 ++++++-
 rocfile/test/CMakeLists.txt      | 20 +++++++++++++++++---
 shared/{ => test}/magic-word.cpp |  0
 shared/{ => test}/magic-word.h   |  0
 4 files changed, 23 insertions(+), 4 deletions(-)
 rename shared/{ => test}/magic-word.cpp (100%)
 rename shared/{ => test}/magic-word.h (100%)

diff --git a/hipfile/test/CMakeLists.txt b/hipfile/test/CMakeLists.txt
index 1ada0341..b742694f 100644
--- a/hipfile/test/CMakeLists.txt
+++ b/hipfile/test/CMakeLists.txt
@@ -6,7 +6,11 @@ include(AISAddExecutable)
 include(AISUseGTest)
 
 set(SHARED_SOURCE_FILES
-    "${CMAKE_SOURCE_DIR}/shared/magic-word.cpp"
+    "${CMAKE_SOURCE_DIR}/shared/test/magic-word.cpp"
+)
+
+set(SHARED_TEST_INCLUDE_PATH
+    "${CMAKE_SOURCE_DIR}/shared/test/"
 )
 
 # These tests do not require a HIP capable GPU.
@@ -26,6 +30,7 @@ set(SYSTEM_TEST_SOURCE_FILES
 set(TEST_SYSINCLS
     ${HIPFILE_INCLUDE_PATH}
     ${HIPFILE_TEST_PATH}
+    ${SHARED_TEST_INCLUDE_PATH}
 )
 
 if(CMAKE_HIP_PLATFORM STREQUAL "nvidia")
diff --git a/rocfile/test/CMakeLists.txt b/rocfile/test/CMakeLists.txt
index c79c0ef6..a3bf1f36 100644
--- a/rocfile/test/CMakeLists.txt
+++ b/rocfile/test/CMakeLists.txt
@@ -5,6 +5,14 @@
 include(AISAddExecutable)
 include(AISUseGTest)
 
+set(SHARED_SOURCE_FILES
+    "${CMAKE_SOURCE_DIR}/shared/test/magic-word.cpp"
+)
+
+set(SHARED_TEST_INCLUDE_PATH
+    "${CMAKE_SOURCE_DIR}/shared/test/"
+)
+
 set(TEST_SOURCE_FILES
     async.cpp
     batch/batch.cpp
@@ -18,14 +26,20 @@ set(TEST_SOURCE_FILES
     mountinfo.cpp
     rocfile.cpp
     stream.cpp
-    "${CMAKE_SOURCE_DIR}/shared/magic-word.cpp"
+)
+
+set(TEST_SYSINCLS
+    ${ROCFILE_SOURCE_PATH}
+    ${ROCFILE_INCLUDE_PATH}
+    ${ROCFILE_TEST_PATH}
+    ${SHARED_TEST_INCLUDE_PATH}
 )
 
 ais_add_executable(
     NAME rocfile_tests
     DEPS rocfile_shared
-    SRCS ${TEST_SOURCE_FILES}
-    SYSINCLS ${ROCFILE_SOURCE_PATH} ${ROCFILE_INCLUDE_PATH} ${ROCFILE_TEST_PATH}
+    SRCS ${TEST_SOURCE_FILES} ${SHARED_SOURCE_FILES}
+    SYSINCLS ${TEST_SYSINCLS}
 )
 target_compile_options(rocfile_tests PRIVATE "-UNDEBUG")
 
diff --git a/shared/magic-word.cpp b/shared/test/magic-word.cpp
similarity index 100%
rename from shared/magic-word.cpp
rename to shared/test/magic-word.cpp
diff --git a/shared/magic-word.h b/shared/test/magic-word.h
similarity index 100%
rename from shared/magic-word.h
rename to shared/test/magic-word.h