From b262162b46e1542c74311cb73e73b78d0edbbdd8 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Tue, 3 Jan 2017 03:48:30 -0500
Subject: [PATCH] tests coverage reorder to avoid lcov issues

---
 Makefile                                      | 4 +++-
 posix-configs/SITL/init/test/test_template.in | 7 ++++++-
 src/firmware/posix/CMakeLists.txt             | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 265a8aa08ba1..7594d437cc6b 100755
--- a/Makefile
+++ b/Makefile
@@ -287,10 +287,12 @@ tests: run_tests_posix
 tests_coverage:
 	@$(call PX4_RUN,lcov --zerocounters --directory $(SRC_DIR) --quiet)
 	@$(call PX4_RUN,lcov --capture --initial --directory $(SRC_DIR) --quiet --output-file coverage.info)
-	@$(call PX4_RUN,$(MAKE) --no-print-directory tests PX4_CODE_COVERAGE=1 CCACHE_DISABLE=1 HEADLESS=1)
+	@$(call PX4_RUN,$(MAKE) --no-print-directory unittest PX4_CODE_COVERAGE=1 CCACHE_DISABLE=1 HEADLESS=1)
+	@$(call PX4_RUN,$(MAKE) --no-print-directory posix_sitl_default test_results PX4_CODE_COVERAGE=1 CCACHE_DISABLE=1 HEADLESS=1)
 	@$(call PX4_RUN,lcov --no-checksum --directory $(SRC_DIR) --capture --quiet --output-file coverage.info)
 	@$(call PX4_RUN,lcov --remove coverage.info '/usr/*' 'unittests/googletest/*' --quiet --output-file coverage.info)
 	@$(call PX4_RUN,genhtml --legend --show-details --function-coverage --quiet --output-directory coverage-html coverage.info)
+	@$(call PX4_RUN,$(MAKE) --no-print-directory posix_sitl_default test_results_junit)
 
 test_startup_shutdown:
 	@$(call PX4_RUN,$(MAKE) --no-print-directory posix_sitl_test gazebo_standard_vtol HEADLESS=1 MEMORY_DEBUG=1)
diff --git a/posix-configs/SITL/init/test/test_template.in b/posix-configs/SITL/init/test/test_template.in
index 0cf3150e21f6..d138191ffea7 100644
--- a/posix-configs/SITL/init/test/test_template.in
+++ b/posix-configs/SITL/init/test/test_template.in
@@ -15,10 +15,15 @@ adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim mode_pwm
-sleep 1
 
 ver all
 
+list_builtins
+list_tasks
+list_devices
+list_topics
+list_files
+
 mavlink start -u 14556 -r 2000000
 mavlink boot_complete
 
diff --git a/src/firmware/posix/CMakeLists.txt b/src/firmware/posix/CMakeLists.txt
index 1798ebe32aaf..8f799e7a15f4 100644
--- a/src/firmware/posix/CMakeLists.txt
+++ b/src/firmware/posix/CMakeLists.txt
@@ -202,7 +202,6 @@ add_custom_target(test_results
 
 add_custom_target(test_results_junit
 		COMMAND xsltproc ${PX4_SOURCE_DIR}/Tools/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > JUnitTestResults.xml
-		DEPENDS test_results
 		COMMENT "Converting ctest output to junit xml"
 		WORKING_DIRECTORY ${PX4_BINARY_DIR})