From 63c16c8804d5029f5fbe6745b1fd2cf818633c8a Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Wed, 20 May 2020 00:44:58 -0500
Subject: [PATCH] fising mytest environment

Change-Id: Ic48c95e711758c3e448c317bc78c1bceeb22362c


[ROCm/roctracer commit: 7c5cfafa30436141cf61895a498598dc1e4c4fc5]
---
 projects/roctracer/test/CMakeLists.txt               |  2 +-
 projects/roctracer/test/MatrixTranspose/Makefile     |  8 ++++----
 .../roctracer/test/MatrixTranspose_test/Makefile     | 12 +++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/projects/roctracer/test/CMakeLists.txt b/projects/roctracer/test/CMakeLists.txt
index dd8c224537..c84dde5d65 100644
--- a/projects/roctracer/test/CMakeLists.txt
+++ b/projects/roctracer/test/CMakeLists.txt
@@ -31,7 +31,7 @@ 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} HSA_PATH=${ROCM_ROOT_DIR}/hsa HIPCC_VERBOSE=3 )
+set ( TEST_ENV HIP_VDI=${HIP_VDI} ROCM_PATH=${ROCM_ROOT_DIR} HSA_PATH=${ROCM_ROOT_DIR}/hsa ROOT_PATH=${ROOT_DIR} LIB_PATH=${PROJECT_BINARY_DIR} HIPCC_VERBOSE=3 )
 add_custom_target( mytest
   COMMAND ${TEST_ENV} make -C "${TEST_DIR}/MatrixTranspose"
   COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose/MatrixTranspose ${PROJECT_BINARY_DIR}/test"
diff --git a/projects/roctracer/test/MatrixTranspose/Makefile b/projects/roctracer/test/MatrixTranspose/Makefile
index bc4ed1781d..1031158348 100644
--- a/projects/roctracer/test/MatrixTranspose/Makefile
+++ b/projects/roctracer/test/MatrixTranspose/Makefile
@@ -1,8 +1,8 @@
-ROOT_PATH = ../..
-LIB_PATH  = $(ROOT_PATH)/build
+ROOT_PATH ?= ../..
+LIB_PATH  ?= $(ROOT_PATH)/build
 ROC_LIBS  = -Wl,--rpath,${LIB_PATH} $(LIB_PATH)/libroctracer64.so $(LIB_PATH)/libroctx64.so
 
-HIP_PATH?= $(wildcard /opt/rocm/hip)
+HIP_PATH ?= $(wildcard /opt/rocm/hip)
 ifeq (,$(HIP_PATH))
 	HIP_PATH=../../..
 endif
@@ -25,10 +25,10 @@ CXXFLAGS =-g -I$(ROOT_PATH) -I$(ROOT_PATH)/inc -DLOCAL_BUILD=1
 CXX=$(HIPCC)
 
 $(EXECUTABLE): $(OBJECTS)
+	/usr/bin/env
 	$(HIPCC) $(OBJECTS) -o $@ $(ROC_LIBS)
 
 test: $(EXECUTABLE)
-	env
 	$(EXECUTABLE)
 
 
diff --git a/projects/roctracer/test/MatrixTranspose_test/Makefile b/projects/roctracer/test/MatrixTranspose_test/Makefile
index 4e3cfb8b33..ad439d5a2e 100644
--- a/projects/roctracer/test/MatrixTranspose_test/Makefile
+++ b/projects/roctracer/test/MatrixTranspose_test/Makefile
@@ -1,11 +1,13 @@
-ROOT_PATH = ../..
-LIB_PATH  = $(ROOT_PATH)/build
-ROC_LIBS  = -Wl,--rpath,${LIB_PATH} $(LIB_PATH)/libroctracer64.so $(LIB_PATH)/libroctx64.so
-ROCM_INC_PATH ?= /opt/rocm/include
+ROOT_PATH ?= ../..
+LIB_PATH  ?= $(ROOT_PATH)/build
+ROCM_PATH ?= /opt/rocm
 HIP_VDI ?= 0
 ITERATIONS ?= 100
 
-HIP_PATH?= $(wildcard /opt/rocm/hip)
+ROC_LIBS  = -Wl,--rpath,${LIB_PATH} $(LIB_PATH)/libroctracer64.so $(LIB_PATH)/libroctx64.so
+ROCM_INC_PATH = $(ROCM_PATH)/include
+
+HIP_PATH ?= $(wildcard /opt/rocm/hip)
 ifeq (,$(HIP_PATH))
 	HIP_PATH=../../..
 endif