Browse Source

tests skip junit output and cmake exclude from all

sbg
Daniel Agar 8 years ago
parent
commit
9689163125
  1. 2
      Makefile
  2. 3
      src/firmware/posix/CMakeLists.txt

2
Makefile

@ -279,7 +279,7 @@ unittest: posix_sitl_default @@ -279,7 +279,7 @@ unittest: posix_sitl_default
@(cd build_unittest && ctest -j2 --output-on-failure)
run_tests_posix:
@$(call PX4_RUN,$(MAKE) --no-print-directory posix_sitl_default test_results_junit)
@$(call PX4_RUN,$(MAKE) --no-print-directory posix_sitl_default test_results)
tests: run_tests_posix
@$(call PX4_RUN,$(MAKE) --no-print-directory unittest)

3
src/firmware/posix/CMakeLists.txt

@ -199,15 +199,18 @@ add_custom_target(test_results @@ -199,15 +199,18 @@ add_custom_target(test_results
USES_TERMINAL
COMMENT "Running tests in sitl"
WORKING_DIRECTORY ${PX4_BINARY_DIR})
set_target_properties(test_results PROPERTIES EXCLUDE_FROM_ALL TRUE)
add_custom_target(test_results_junit
COMMAND xsltproc ${PX4_SOURCE_DIR}/Tools/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > JUnitTestResults.xml
COMMENT "Converting ctest output to junit xml"
WORKING_DIRECTORY ${PX4_BINARY_DIR})
set_target_properties(test_results_junit PROPERTIES EXCLUDE_FROM_ALL TRUE)
add_custom_target(test_cdash_submit
COMMAND ${CMAKE_CTEST_COMMAND} -D Experimental
USES_TERMINAL
WORKING_DIRECTORY ${PX4_BINARY_DIR})
set_target_properties(test_cdash_submit PROPERTIES EXCLUDE_FROM_ALL TRUE)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :

Loading…
Cancel
Save