fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 09:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

sitl_tests: add prefix "sitl-" for regex test filtering

Browse Source
This commit is contained in:
Matthias Grob
2019-05-09 09:42:46 +02:00
parent 5020dfdc3d
commit 5a90382cb8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/gtest/px4_add_gtest.cmake
+1 -1
View File
@@ -53,7 +53,7 @@ function(px4_add_gtest)
# infer test name from source filname # infer test name from source filname
get_filename_component(TESTNAME ${SRC} NAME_WE) get_filename_component(TESTNAME ${SRC} NAME_WE)
string(REPLACE Test "" TESTNAME ${TESTNAME}) string(REPLACE Test "" TESTNAME ${TESTNAME})
set(TESTNAME UnitTest-${TESTNAME}) set(TESTNAME unit-${TESTNAME})
# build a binary for the unit test # build a binary for the unit test
add_executable(${TESTNAME} EXCLUDE_FROM_ALL ${SRC}) add_executable(${TESTNAME} EXCLUDE_FROM_ALL ${SRC})
platforms/posix/cmake/sitl_tests.cmake
+5 -4
View File
@@ -54,9 +54,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
endif() endif()
foreach(test_name ${tests}) foreach(test_name ${tests})
set(test_name_prefix sitl-${test_name})
configure_file(${PX4_SOURCE_DIR}/posix-configs/SITL/init/test/test_template.in ${PX4_SOURCE_DIR}/posix-configs/SITL/init/test/test_${test_name}_generated) configure_file(${PX4_SOURCE_DIR}/posix-configs/SITL/init/test/test_template.in ${PX4_SOURCE_DIR}/posix-configs/SITL/init/test/test_${test_name}_generated)
add_test(NAME ${test_name} add_test(NAME ${test_name_prefix}
COMMAND ${PX4_SOURCE_DIR}/Tools/sitl_run.sh COMMAND ${PX4_SOURCE_DIR}/Tools/sitl_run.sh
$<TARGET_FILE:px4> $<TARGET_FILE:px4>
none none
@@ -66,10 +67,10 @@ foreach(test_name ${tests})
${PX4_BINARY_DIR} ${PX4_BINARY_DIR}
WORKING_DIRECTORY ${SITL_WORKING_DIR}) WORKING_DIRECTORY ${SITL_WORKING_DIR})
set_tests_properties(${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION "${test_name} FAILED") set_tests_properties(${test_name_prefix} PROPERTIES FAIL_REGULAR_EXPRESSION "${test_name} FAILED")
set_tests_properties(${test_name} PROPERTIES PASS_REGULAR_EXPRESSION "${test_name} PASSED") set_tests_properties(${test_name_prefix} PROPERTIES PASS_REGULAR_EXPRESSION "${test_name} PASSED")
sanitizer_fail_test_on_error(${test_name}) sanitizer_fail_test_on_error(${test_name_prefix})
endforeach() endforeach()