From d6cd83491e2c4399556d112e2efa9ec3b8d988b3 Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Tue, 19 May 2020 17:20:25 -0500
Subject: [PATCH] fix hsa_path

Change-Id: I07c6a504ec1892f314fcbb207656baaf0e356864


[ROCm/roctracer commit: c956bb9c6b31a147f288a670f39fc52bc66da371]
---
 projects/roctracer/test/CMakeLists.txt           | 4 ++--
 projects/roctracer/test/MatrixTranspose/Makefile | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/roctracer/test/CMakeLists.txt b/projects/roctracer/test/CMakeLists.txt
index f43d628c96..dd8c224537 100644
--- a/projects/roctracer/test/CMakeLists.txt
+++ b/projects/roctracer/test/CMakeLists.txt
@@ -31,9 +31,9 @@ set ( HSA_REV "48bd999" )
 set ( RUN_SCRIPT "${TEST_DIR}/run.sh" )
 
 ## build HIP tests
-set ( TEST_ENV HIP_VDI=${HIP_VDI} ROCM_INC_PATH=${ROCM_INC_PATH} ROCM_PATH=${ROCM_ROOT_DIR} HIPCC_VERBOSE=3 )
+set ( TEST_ENV HIP_VDI=${HIP_VDI} ROCM_INC_PATH=${ROCM_INC_PATH} ROCM_PATH=${ROCM_ROOT_DIR} HSA_PATH=${ROCM_ROOT_DIR}/hsa HIPCC_VERBOSE=3 )
 add_custom_target( mytest
-  COMMAND make -C "${TEST_DIR}/MatrixTranspose"
+  COMMAND ${TEST_ENV} make -C "${TEST_DIR}/MatrixTranspose"
   COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose/MatrixTranspose ${PROJECT_BINARY_DIR}/test"
   COMMAND ${TEST_ENV} make -C "${TEST_DIR}/MatrixTranspose_test"
   COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose_test/MatrixTranspose ${PROJECT_BINARY_DIR}/test/MatrixTranspose_test"
diff --git a/projects/roctracer/test/MatrixTranspose/Makefile b/projects/roctracer/test/MatrixTranspose/Makefile
index 63fae09943..bc4ed1781d 100644
--- a/projects/roctracer/test/MatrixTranspose/Makefile
+++ b/projects/roctracer/test/MatrixTranspose/Makefile
@@ -28,6 +28,7 @@ $(EXECUTABLE): $(OBJECTS)
 	$(HIPCC) $(OBJECTS) -o $@ $(ROC_LIBS)
 
 test: $(EXECUTABLE)
+	env
 	$(EXECUTABLE)