From 8b178aaa6517336bf9e965b273f8c48c6e66d299 Mon Sep 17 00:00:00 2001
From: Ben Dyer <ben.dyer@taguchimail.com>
Date: Sun, 25 Oct 2015 17:51:30 +1100
Subject: [PATCH] Use --gtest_filter to exclude real-time tests, instead of
 modifying source

---
 libuavcan/CMakeLists.txt                  | 8 ++------
 libuavcan/include/uavcan/build_config.hpp | 7 -------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/libuavcan/CMakeLists.txt b/libuavcan/CMakeLists.txt
index 104c2e35e3..137732bd1d 100644
--- a/libuavcan/CMakeLists.txt
+++ b/libuavcan/CMakeLists.txt
@@ -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
diff --git a/libuavcan/include/uavcan/build_config.hpp b/libuavcan/include/uavcan/build_config.hpp
index f099856744..c1ee6dc1e0 100644
--- a/libuavcan/include/uavcan/build_config.hpp
+++ b/libuavcan/include/uavcan/build_config.hpp
@@ -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.