Skip to content
Snippets Groups Projects
Commit 45b59f7d authored by Lars Bilke's avatar Lars Bilke Committed by Dmitri Naumov
Browse files

Time is just a shell function and FIND_PROGRAM has no REQUIRED arg.

parent 7d079f9c
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,7 @@ FUNCTION (AddTest executable case_path case_name wrapper)
# Implement wrappers
IF(wrapper STREQUAL "TIME")
SET(WRAPPER_COMMAND ${TIME_TOOL_PATH})
SET(WRAPPER_COMMAND time)
ELSEIF(wrapper STREQUAL "MEMCHECK" AND VALGRIND_TOOL_PATH)
SET(WRAPPER_COMMAND "${VALGRIND_TOOL_PATH} --tool=memcheck --log-file=${case_path}/${case_name}_memcheck.log -v --leak-check=full --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xff")
SET(tester MEMCHECK)
......
# Find tools and data
FIND_PROGRAM(TIME_TOOL_PATH time REQUIRED)
FIND_PROGRAM(DIFF_TOOL_PATH diff REQUIRED)
FIND_PROGRAM(GREP_TOOL_PATH grep REQUIRED)
FIND_PROGRAM(BASH_TOOL_PATH bash REQUIRED)
FIND_PROGRAM(VALGRIND_TOOL_PATH valgrind REQUIRED)
FIND_FILE(OGS-DATA_PATH ".ogs6-data.dummy" REQUIRED
FIND_PROGRAM(DIFF_TOOL_PATH diff)
FIND_PROGRAM(GREP_TOOL_PATH grep)
FIND_PROGRAM(BASH_TOOL_PATH bash)
FIND_PROGRAM(VALGRIND_TOOL_PATH valgrind)
FIND_FILE(OGS-DATA_PATH ".ogs6-data.dummy"
HINTS ${CMAKE_SOURCE_DIR}/../ogs6-data)
GET_FILENAME_COMPONENT(OGS-DATA_PATH ${OGS-DATA_PATH} PATH)
......
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