yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Testing: hotfix to recover test coverage CI

Browse Source 
CMAKE_TESTING should automatically be enabled
but I hoped to do that in the test.cmake
target specific options and not in the main
CMakeLists. I have to see if I can make that
order work. Here the hotfix to make CI work
again.
This commit is contained in:
Matthias Grob
2019-05-09 21:31:24 +01:00
committed by Lorenz Meier
parent 61512f063a
commit 146a3866c0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -415,6 +415,9 @@ endif()
# optionally enable cmake testing (supported only on posix) # optionally enable cmake testing (supported only on posix)
option(CMAKE_TESTING "Configure test targets" OFF) option(CMAKE_TESTING "Configure test targets" OFF)
if (${PX4_CONFIG} STREQUAL "px4_sitl_test")
set(CMAKE_TESTING ON)
endif()
if(CMAKE_TESTING) if(CMAKE_TESTING)
include(CTest) # sets BUILD_TESTING variable include(CTest) # sets BUILD_TESTING variable
endif() endif()

1
Makefile
View File

@@ -344,7 +344,6 @@ format:
.PHONY: rostest python_coverage .PHONY: rostest python_coverage
tests: tests:
$(eval CMAKE_ARGS += -DCMAKE_TESTING=ON)
$(eval CMAKE_ARGS += -DCONFIG=px4_sitl_test) $(eval CMAKE_ARGS += -DCONFIG=px4_sitl_test)
$(eval CMAKE_ARGS += -DTESTFILTER=$(TESTFILTER)) $(eval CMAKE_ARGS += -DTESTFILTER=$(TESTFILTER))
$(eval ARGS += test_results) $(eval ARGS += test_results)