From a2ebcdf825937ea22b4af256e968d67b255949c4 Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Wed, 7 Mar 2018 15:08:20 -0600
Subject: [PATCH] build/test adapting for ROCm packaging

Change-Id: I4bf855cd6f0eb8432194e20fce0ad4cd05692813
---
 test/CMakeLists.txt |  6 +++---
 test/run.sh         | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ed6e7adbf8..126af30d33 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,12 +1,14 @@
 cmake_minimum_required ( VERSION 3.5.0 )
 set ( CMAKE_VERBOSE_MAKEFILE TRUE CACHE BOOL "Verbose Output" FORCE )
 
+set ( EXE_NAME "ctrl" )
+set ( TEST_LIB "tool" )
+
 if ( NOT DEFINED TEST_DIR )
   set ( TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR} )
   project ( ${EXE_NAME} )
   ## Set build environment
   include ( env )
-  set ( ROCPROFILER_TARGET "rocprofiler64" )
 endif ()
 
 ## Util sources
@@ -24,7 +26,6 @@ set ( KERN_SRC ${TEST_DIR}/${TEST_NAME}/${TEST_NAME}.cpp )
 execute_process ( COMMAND sh -xc "cp ${TEST_DIR}/${TEST_NAME}/*.hsaco ${PROJECT_BINARY_DIR}" )
 
 ## Building test executable
-set ( EXE_NAME "ctrl" )
 add_executable ( ${EXE_NAME} ${KERN_SRC} ${CTRL_SRC} ${UTIL_SRC} )
 target_include_directories ( ${EXE_NAME} PRIVATE ${TEST_DIR} ${ROOT_DIR} ${HSA_RUNTIME_INC_PATH} )
 target_link_libraries( ${EXE_NAME} ${ROCPROFILER_TARGET} ${HSA_RUNTIME_LIB} c stdc++ dl pthread rt atomic )
@@ -33,7 +34,6 @@ execute_process ( COMMAND sh -xc "cp ${TEST_DIR}/*.xml ${PROJECT_BINARY_DIR}" )
 execute_process ( COMMAND sh -xc "mkdir -p ${PROJECT_BINARY_DIR}/RESULTS" )
 
 ## Build test library
-set ( TEST_LIB "tool" )
 set ( TEST_LIB_SRC ${TEST_DIR}/ctrl/tool.cpp )
 add_library ( ${TEST_LIB} SHARED ${TEST_LIB_SRC} )
 target_include_directories ( ${TEST_LIB} PRIVATE ${TEST_DIR} ${ROOT_DIR} ${HSA_RUNTIME_INC_PATH} )
diff --git a/test/run.sh b/test/run.sh
index 211658a171..b7a413ee7f 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -10,7 +10,7 @@ export ROCPROFILER_LOG=1
 # ROC profiler library loaded by HSA runtime
 export HSA_TOOLS_LIB=librocprofiler64.so
 # tool library loaded by ROC profiler
-export ROCP_TOOL_LIB=test/libtool.so
+export ROCP_TOOL_LIB=libtool.so
 # enable HSA dispatch intercepting by ROC profiler
 export ROCP_HSA_INTERCEPT=1
 # ROC profiler metrics config file
@@ -23,14 +23,20 @@ export ROCP_INPUT=input.xml
 # and SQTT trace files 'thread_trace.se<n>.out'
 export ROCP_OUTPUT_DIR=./RESULTS
 
+if [ ! -e $ROCP_TOOL_LIB ] ; then
+  ln -s test/$ROCP_TOOL_LIB
+fi
+
 if [ -n "$1" ] ; then
   tbin="$*"
 else
   tbin=$test_bin_dflt
 fi
-echo "Run $tbin"
+
 export ROCP_KITER=100
 export ROCP_DITER=100
+
+echo "Run $tbin"
 eval $tbin
 #valgrind --leak-check=full $tbin
 #valgrind --tool=massif $tbin