Skip to content

Commit

Permalink
tests coverage reorder to avoid lcov issues
Browse files Browse the repository at this point in the history
  • Loading branch information
dagar committed Jan 3, 2017
1 parent 95428f9 commit b262162
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 6 additions & 1 deletion posix-configs/SITL/init/test/test_template.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion src/firmware/posix/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down

0 comments on commit b262162

Please sign in to comment.