p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

port to rosunit, #3112

This commit is contained in:
Brian Gerkey 2010-11-10 22:47:36 +00:00
parent 91ad410475
commit 35b2ca8294
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/rosbuild/private.cmake
View File

@ -148,17 +148,17 @@ macro(_rosbuild_add_gtest exe)
# Create target for this test
# We use rostest to call the executable to get process control, #1629
# We use rosunit to call the executable to get process control, #1629, #3112
# But don't depend on the gtest executable if rosbuild_test_nobuild is set, #3008
if(NOT rosbuild_test_nobuild)
add_custom_target(test_${_testname}
COMMAND rostest --bare --bare-name=${_testname} --bare-limit=${_gtest_TIMEOUT} ${EXECUTABLE_OUTPUT_PATH}/${exe}
COMMAND ${rosunit_path}/bin/rosunit --name=${_testname} --time-limit=${_gtest_TIMEOUT} ${EXECUTABLE_OUTPUT_PATH}/${exe}
DEPENDS ${EXECUTABLE_OUTPUT_PATH}/${exe}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
VERBATIM)
else(NOT rosbuild_test_nobuild)
add_custom_target(test_${_testname}
COMMAND rostest --bare --bare-name=${_testname} --bare-limit=${_gtest_TIMEOUT} ${EXECUTABLE_OUTPUT_PATH}/${exe}
COMMAND ${rosunit_path}/bin/rosunit --name=${_testname} --time-limit=${_gtest_TIMEOUT} ${EXECUTABLE_OUTPUT_PATH}/${exe}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
VERBATIM)
endif(NOT rosbuild_test_nobuild)
@ -258,7 +258,7 @@ macro(_rosbuild_add_pyunit file)
# Create target for this test
# We use rostest to call the executable to get process control, #1629
add_custom_target(pyunit_${_testname}
COMMAND rostest --bare --bare-name=${_testname} --bare-limit=${_pyunit_TIMEOUT} -- python ${file} ${_covarg}
COMMAND ${rosunit_path}/bin/rosunit --name=${_testname} --time-limit=${_pyunit_TIMEOUT} -- ${file} ${_covarg}
DEPENDS ${file}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
VERBATIM)