From 9689163125e0d9e25ddd6081ac20aab9a33e1a17 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 3 Jan 2017 04:15:12 -0500 Subject: [PATCH] tests skip junit output and cmake exclude from all --- Makefile | 2 +- src/firmware/posix/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7594d437cc..31516df8f2 100755 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/src/firmware/posix/CMakeLists.txt b/src/firmware/posix/CMakeLists.txt index 8f799e7a15..2eada05695 100644 --- a/src/firmware/posix/CMakeLists.txt +++ b/src/firmware/posix/CMakeLists.txt @@ -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 :