Skip to content
Snippets Groups Projects
Commit 309a4eaa authored by Jan David Mol's avatar Jan David Mol
Browse files

Task #9893: Fixed tests after merge: put test kernels in BINARY_DIR/share to...

Task #9893: Fixed tests after merge: put test kernels in BINARY_DIR/share to let createPTX find them. Also, let createPTX look ONLY in LOFARROOT related paths, not .
parent 8a9a9413
No related branches found
No related tags found
No related merge requests found
...@@ -199,14 +199,12 @@ namespace LOFAR ...@@ -199,14 +199,12 @@ namespace LOFAR
string prefixPath() string prefixPath()
{ {
if (lofarRoot().empty()) return "."; return lofarRoot() + "/share/gpu/kernels";
else return lofarRoot() + "/share/gpu/kernels";
} }
string includePath() string includePath()
{ {
if (lofarRoot().empty()) return "include"; return lofarRoot() + "/include";
else return lofarRoot() + "/include";
} }
ostream& operator<<(ostream& os, const CompileDefinitions& defs) ostream& operator<<(ostream& os, const CompileDefinitions& defs)
......
...@@ -37,12 +37,15 @@ lofar_add_test(tKernelOccupancy tKernelOccupancy.cc) ...@@ -37,12 +37,15 @@ lofar_add_test(tKernelOccupancy tKernelOccupancy.cc)
lofar_add_test(tStreamReadBuffer tStreamReadBuffer.cc) lofar_add_test(tStreamReadBuffer tStreamReadBuffer.cc)
lofar_add_test(tMultiDimArrayHostBuffer tMultiDimArrayHostBuffer.cc) lofar_add_test(tMultiDimArrayHostBuffer tMultiDimArrayHostBuffer.cc)
# These tests need to find kernels in the build dir # These kernels need to be in the build dir for createPTX to find them in the tests
set_tests_properties( set(_test_kernels
tKernel tKernel.in_.cu
tKernelOccupancy tKernelOccupancy.in_.cu
PROPERTIES ENVIRONMENT "LOFARROOT="
) )
foreach(_name ${_test_kernels})
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}/${_name} ${CMAKE_BINARY_DIR}/share/${_name})
endforeach()
# GPU kernel unit tests # GPU kernel unit tests
lofar_add_test(tFIR_Filter tFIR_Filter.cc) lofar_add_test(tFIR_Filter tFIR_Filter.cc)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment