Use --gtest_filter to exclude real-time tests, instead of modifying source

This commit is contained in:
Ben Dyer
2015-10-25 17:51:30 +11:00
parent c446898d05
commit 8b178aaa65
2 changed files with 2 additions and 13 deletions
+2 -6
View File
@@ -56,10 +56,6 @@ if (DEBUG_BUILD)
add_definitions(-DUAVCAN_DEBUG=1)
endif ()
if (CONTINUOUS_INTEGRATION_BUILD)
add_definitions(-DUAVCAN_NO_TIMING_SENSITIVE_TESTS=1)
endif ()
include_directories(include)
#
@@ -97,9 +93,9 @@ function(add_libuavcan_test name library flags) # Adds GTest executable and crea
# Tests run automatically upon successful build
# If failing tests need to be investigated with debugger, use 'make --ignore-errors'
if (CONTINUOUS_INTEGRATION_BUILD)
# Don't redirect test output
# Don't redirect test output, and don't run tests suffixed with "RealTime"
add_custom_command(TARGET ${name} POST_BUILD
COMMAND ./${name}
COMMAND ./${name} --gtest_filter=-*RealTime
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
else ()
add_custom_command(TARGET ${name} POST_BUILD
@@ -151,13 +151,6 @@
# define UAVCAN_USE_EXTERNAL_FLOAT16_CONVERSION 0
#endif
/*
* Disables timing-dependent tests in the test suite, since these may fail on virtualized machines
*/
#ifndef UAVCAN_NO_TIMING_SENSITIVE_TESTS
# define UAVCAN_NO_TIMING_SENSITIVE_TESTS 0
#endif
/**
* Run time checks.
* Resolves to the standard assert() by default.