Update definitions

Signed-off-by: Stephen Brawner <brawner@gmail.com>

Author: brawner

CMakeLists.txt

@@ -119,6 +119,10 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}
   RUNTIME DESTINATION bin)
 
 if(BUILD_TESTING)
+  if(NOT RCUTILS_DISABLE_FAULT_INJECTION)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DRCUTILS_ENABLE_FAULT_INJECTION")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DRCUTILS_ENABLE_FAULT_INJECTION")
+  endif()
   if(NOT WIN32)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
   endif()

include/rcutils/testing/fault_injection.h

@@ -17,6 +17,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -34,8 +35,6 @@ int_least64_t _rcutils_fault_injection_get_count();
 
 int _rcutils_fault_injection_maybe_fail();
 
-#if defined RCUTILS_ENABLE_FAULT_INJECTION
-
 /**
  * \def RCUTILS_FAULT_INJECTION_MAYBE_RETURN_ERROR
  * \brief This macro checks and decrements a static global variable atomic counter and returns
@@ -114,19 +113,6 @@ int _rcutils_fault_injection_maybe_fail();
     RCUTILS_FAULT_INJECTION_SET_COUNT(RCUTILS_FAULT_INJECTION_NEVER_FAIL); \
   } while (0)
 
-#else  // RCUTILS_ENABLE_FAULT_INJECTION
-
-#define RCUTILS_FAULT_INJECTION_SET_COUNT(count)
-
-// This needs to be set to an int for compatibility
-#define RCUTILS_FAULT_INJECTION_GET_COUNT() RCUTILS_FAULT_INJECTION_NEVER_FAIL
-
-#define RCUTILS_FAULT_INJECTION_MAYBE_RETURN_ERROR(msg, error_statement)
-
-#define RCUTILS_FAULT_INJECTION_TEST(code) return;
-
-#endif  // defined RCUTILS_ENABLE_FAULT_INJECTION
-
 #ifdef __cplusplus
 }
 #endif

src/testing/fault_injection.c

@@ -22,9 +22,9 @@ bool rcutils_fault_injection_is_test_complete()
 {
 #ifndef RCUTILS_ENABLE_FAULT_INJECTION
   return true;
-#endif  // RCUTILS_ENABLE_FAULT_INJECTION
-
+#else  // RCUTILS_ENABLE_FAULT_INJECTION
   return _rcutils_fault_injection_get_count() > RCUTILS_FAULT_INJECTION_NEVER_FAIL;
+#endif  // RCUTILS_ENABLE_FAULT_INJECTION
 }
 
 int _rcutils_fault_injection_maybe_fail()