Fix hipify tool discovery in lit test for standalone build case

test/CMakeLists.txt

@@ -6,7 +6,7 @@ if( NOT PYTHONINTERP_FOUND )
           "Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
 endif()
 
-set(BINARY_DIR       ${CMAKE_CURRENT_BINARY_DIR}  )
+set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/..  )
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
@@ -16,7 +16,7 @@ configure_file(
 add_lit_testsuite(check-hipify "Running HIPify regression tests"
   ${CMAKE_CURRENT_SOURCE_DIR}
   PARAMS site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-  DEPENDS hipify
+  DEPENDS hipify FileCheck lit
   )
 
 add_custom_target(check)

test/lit.cfg

@@ -51,4 +51,5 @@ if not tool_path:
     lit_config.note('Did not find ' + tool_name + ' in ' + llvm_tools_dir)
     tool_path = llvm_tools_dir + '/' + tool_name
 config.substitutions.append((tool_name, tool_path))
+config.substitutions.append(("hipify", obj_root+"/hipify"))
 

test/lit.site.cfg.in

@@ -1,7 +1,7 @@
 import sys
 
 config.llvm_tools_dir = "@LLVM_TOOLS_BINARY_DIR@"
-config.obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
+config.obj_root = "@BINARY_DIR@"
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.