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

Removed accidentally added check against ROS_BUILD_TEST_LABEL from rosbuild_add_rostest

This commit is contained in:
Brian Gerkey 2009-09-25 20:16:36 +00:00
parent a09180b15b
commit a59c052c6a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/rosbuild/public.cmake
View File

@ -544,12 +544,9 @@ endmacro(rosbuild_add_gtest_future)
macro(rosbuild_add_rostest file) macro(rosbuild_add_rostest file)
string(REPLACE "/" "_" _testname ${file}) string(REPLACE "/" "_" _testname ${file})
_rosbuild_add_rostest(${file}) _rosbuild_add_rostest(${file})
# Check for agreement of optional label and environment variable # Redeclaration of target is to workaround bug in 2.4.6
if("${ARGN}" STREQUAL "$ENV{ROS_BUILD_TEST_LABEL}") add_custom_target(test)
# Redeclaration of target is to workaround bug in 2.4.6 add_dependencies(test rostest_${_testname})
add_custom_target(test)
add_dependencies(test rostest_${_testname})
endif("${ARGN}" STREQUAL "$ENV{ROS_BUILD_TEST_LABEL}")
_rosbuild_check_rostest_result(rostest_${_testname} ${PROJECT_NAME} ${file}) _rosbuild_check_rostest_result(rostest_${_testname} ${PROJECT_NAME} ${file})
endmacro(rosbuild_add_rostest) endmacro(rosbuild_add_rostest)