From 145afd6a785dd114cb889bda70e05949d96d2e4b Mon Sep 17 00:00:00 2001
From: Jason Tang <jason.tang@amd.com>
Date: Fri, 19 Aug 2022 18:18:15 -0400
Subject: [PATCH] SWDEV-350058 - Create ocltst package

Change-Id: Ifd1f538254c174da5bca2535ade5ac25c49bf673
---
 opencl/packaging/CMakeLists.txt                   | 15 ++++++++++++---
 opencl/tests/ocltst/env/CMakeLists.txt            |  2 +-
 opencl/tests/ocltst/log/CMakeLists.txt            |  2 +-
 opencl/tests/ocltst/module/gl/CMakeLists.txt      |  4 ++--
 opencl/tests/ocltst/module/perf/CMakeLists.txt    |  4 ++--
 opencl/tests/ocltst/module/runtime/CMakeLists.txt |  4 ++--
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/opencl/packaging/CMakeLists.txt b/opencl/packaging/CMakeLists.txt
index 8f9fc88c53..a703f58a15 100644
--- a/opencl/packaging/CMakeLists.txt
+++ b/opencl/packaging/CMakeLists.txt
@@ -3,10 +3,12 @@ project(rocm-opencl)
 
 set(CPACK_COMPONENTS_ALL binary dev)
 if(BUILD_ICD)
-set(CPACK_COMPONENTS_ALL binary dev icd)
-else()
-set(CPACK_COMPONENTS_ALL binary dev)
+set(CPACK_COMPONENTS_ALL "${CPACK_COMPONENTS_ALL}" icd)
 endif()
+if(BUILD_TESTS)
+set(CPACK_COMPONENTS_ALL "${CPACK_COMPONENTS_ALL}" ocltst)
+endif()
+
 set(CPACK_DEB_COMPONENT_INSTALL ON)
 set(CPACK_RPM_COMPONENT_INSTALL ON)
 
@@ -101,6 +103,13 @@ if(BUILD_ICD)
   set(CPACK_RPM_ICD_PACKAGE_REQUIRES "rocm-core")
 endif()
 
+if(BUILD_TESTS)
+  set(CPACK_OCLTST_DEB "ON")
+  set(CPACK_DEBIAN_OCLTST_PACKAGE_NAME "rocm-ocltst")
+  set(CPACK_OCLTST_RPM "ON")
+  set(CPACK_RPM_OCLTST_PACKAGE_NAME "rocm-ocltst")
+endif()
+
 if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE})
   set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE})
 else()
diff --git a/opencl/tests/ocltst/env/CMakeLists.txt b/opencl/tests/ocltst/env/CMakeLists.txt
index 5b1959488a..29819b7e63 100644
--- a/opencl/tests/ocltst/env/CMakeLists.txt
+++ b/opencl/tests/ocltst/env/CMakeLists.txt
@@ -38,5 +38,5 @@ target_link_libraries(ocltst
         OpenCL
         TestLog)
 
-INSTALL(TARGETS ocltst DESTINATION tests/ocltst)
+INSTALL(TARGETS ocltst DESTINATION tests/ocltst COMPONENT ocltst)
 
diff --git a/opencl/tests/ocltst/log/CMakeLists.txt b/opencl/tests/ocltst/log/CMakeLists.txt
index d5f58d9350..6e359e29ee 100644
--- a/opencl/tests/ocltst/log/CMakeLists.txt
+++ b/opencl/tests/ocltst/log/CMakeLists.txt
@@ -17,5 +17,5 @@ target_include_directories(TestLog
     PUBLIC
         ${OCLTST_DIR}/log)
 
-INSTALL(TARGETS TestLog DESTINATION tests/ocltst)
+INSTALL(TARGETS TestLog DESTINATION tests/ocltst COMPONENT ocltst)
 
diff --git a/opencl/tests/ocltst/module/gl/CMakeLists.txt b/opencl/tests/ocltst/module/gl/CMakeLists.txt
index 592f7a6d6d..aa9559e3c9 100644
--- a/opencl/tests/ocltst/module/gl/CMakeLists.txt
+++ b/opencl/tests/ocltst/module/gl/CMakeLists.txt
@@ -68,6 +68,6 @@ foreach(TEST ${TESTS})
         USES_TERMINAL)
 endforeach()
 
-INSTALL(TARGETS oclgl DESTINATION tests/ocltst)
-INSTALL(FILES oclgl.exclude DESTINATION tests/ocltst)
+INSTALL(TARGETS oclgl DESTINATION tests/ocltst COMPONENT ocltst)
+INSTALL(FILES oclgl.exclude DESTINATION tests/ocltst COMPONENT ocltst)
 
diff --git a/opencl/tests/ocltst/module/perf/CMakeLists.txt b/opencl/tests/ocltst/module/perf/CMakeLists.txt
index bf6eb66e49..f017d089e3 100644
--- a/opencl/tests/ocltst/module/perf/CMakeLists.txt
+++ b/opencl/tests/ocltst/module/perf/CMakeLists.txt
@@ -140,6 +140,6 @@ foreach(TEST ${TESTS})
         USES_TERMINAL)
 endforeach()
 
-INSTALL(TARGETS oclperf DESTINATION tests/ocltst)
-INSTALL(FILES oclperf.exclude DESTINATION tests/ocltst)
+INSTALL(TARGETS oclperf DESTINATION tests/ocltst COMPONENT ocltst)
+INSTALL(FILES oclperf.exclude DESTINATION tests/ocltst COMPONENT ocltst)
 
diff --git a/opencl/tests/ocltst/module/runtime/CMakeLists.txt b/opencl/tests/ocltst/module/runtime/CMakeLists.txt
index 74817054d9..e502d4be76 100644
--- a/opencl/tests/ocltst/module/runtime/CMakeLists.txt
+++ b/opencl/tests/ocltst/module/runtime/CMakeLists.txt
@@ -108,6 +108,6 @@ foreach(TEST ${TESTS})
         USES_TERMINAL)
 endforeach()
 
-INSTALL(TARGETS oclruntime DESTINATION tests/ocltst)
-INSTALL(FILES oclruntime.exclude DESTINATION tests/ocltst)
+INSTALL(TARGETS oclruntime DESTINATION tests/ocltst COMPONENT ocltst)
+INSTALL(FILES oclruntime.exclude DESTINATION tests/ocltst COMPONENT ocltst)