fising mytest environment

Change-Id: Ic48c95e711758c3e448c317bc78c1bceeb22362c


[ROCm/roctracer commit: 7c5cfafa30]

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"

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)
 
 

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