Browse Source

tests: properly disable shutdown test for Cygwin

sbg
Julian Oes 6 years ago
parent
commit
8486b2b917
  1. 30
      platforms/posix/cmake/sitl_tests.cmake

30
platforms/posix/cmake/sitl_tests.cmake

@ -46,7 +46,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "CYGWIN") @@ -46,7 +46,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
list(REMOVE_ITEM tests
hysteresis # Intermittent timing fails.
uorb
shutdown # A mystery why it fails.
)
endif()
@ -85,20 +84,23 @@ set_tests_properties(mavlink PROPERTIES FAIL_REGULAR_EXPRESSION "mavlink FAILED" @@ -85,20 +84,23 @@ set_tests_properties(mavlink PROPERTIES FAIL_REGULAR_EXPRESSION "mavlink FAILED"
set_tests_properties(mavlink PROPERTIES PASS_REGULAR_EXPRESSION "mavlink PASSED")
sanitizer_fail_test_on_error(mavlink)
# Shutdown test
add_test(NAME shutdown
COMMAND ${PX4_SOURCE_DIR}/Tools/sitl_run.sh
$<TARGET_FILE:px4>
none
none
test_shutdown
${PX4_SOURCE_DIR}
${PX4_BINARY_DIR}
WORKING_DIRECTORY ${SITL_WORKING_DIR})
# A mystery why this fails on Cygwin currently.
if(NOT CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
# Shutdown test
add_test(NAME shutdown
COMMAND ${PX4_SOURCE_DIR}/Tools/sitl_run.sh
$<TARGET_FILE:px4>
none
none
test_shutdown
${PX4_SOURCE_DIR}
${PX4_BINARY_DIR}
WORKING_DIRECTORY ${SITL_WORKING_DIR})
#set_tests_properties(shutdown PROPERTIES FAIL_REGULAR_EXPRESSION "shutdown FAILED")
set_tests_properties(shutdown PROPERTIES PASS_REGULAR_EXPRESSION "Shutting down")
sanitizer_fail_test_on_error(shutdown)
#set_tests_properties(shutdown PROPERTIES FAIL_REGULAR_EXPRESSION "shutdown FAILED")
set_tests_properties(shutdown PROPERTIES PASS_REGULAR_EXPRESSION "Shutting down")
sanitizer_fail_test_on_error(shutdown)
endif()
# Dynamic module loading test
add_test(NAME dyn

Loading…
Cancel
Save