Disallow non fatal tests (#5369)

We do not have any tests currently using this, we do not want
to start having them.

Author: ktf

.cmake-format.py

@@ -86,7 +86,7 @@
         }
     },
     "o2_add_test_wrapper": {
-        "flags": ["DONT_FAIL_ON_TIMEOUT", "NON_FATAL"],
+        "flags": ["DONT_FAIL_ON_TIMEOUT"],
         "kwargs": {
             "COMMAND": '*',
             "NO_BOOST_TEST": '*',
@@ -104,7 +104,6 @@
         "kwargs": {
             "INSTALL": '*',
             "NO_BOOST_TEST": '*',
-            "NON_FATAL": '*',
             "COMPONENT_NAME": '*',
             "MAX_ATTEMPTS": '*',
             "TIMEOUT": '*',
@@ -117,7 +116,7 @@
         }
     },
     "o2_add_test_root_macro": {
-        "flags": ["NON_FATAL", "LOAD_ONLY"],
+        "flags": ["LOAD_ONLY"],
         "kwargs": {
             "ENVIRONMENT": '*',
             "PUBLIC_LINK_LIBRARIES": '*',

cmake/O2AddTest.cmake

@@ -43,7 +43,6 @@ include(O2AddTestWrapper)
 #   before it is actually considered as failed
 # * TIMEOUT : the number of seconds allowed for the test to run. Past this time
 #   failure is assumed.
-# * NON_FATAL : true if the failing of this test is not causing the CI to fail
 # * ENVIRONMENT: extra environment needed by the test to run properly
 #
 function(o2_add_test)
@@ -56,7 +55,7 @@ function(o2_add_test)
     PARSE_ARGV
     1
     A
-    "INSTALL;NO_BOOST_TEST;NON_FATAL"
+    "INSTALL;NO_BOOST_TEST"
     "COMPONENT_NAME;MAX_ATTEMPTS;TIMEOUT;WORKING_DIRECTORY;NAME"
     "SOURCES;PUBLIC_LINK_LIBRARIES;COMMAND_LINE_ARGS;LABELS;CONFIGURATIONS;ENVIRONMENT"
     )
@@ -95,11 +94,6 @@ function(o2_add_test)
                     COMPONENT_NAME ${A_COMPONENT_NAME}
                     IS_TEST ${noInstall} TARGETVARNAME targetName)
 
-  set(nonFatal "")
-  if(NON_FATAL)
-    set(nonFatal NON_FATAL)
-  endif()
-
   # create a test with a script wrapping the executable above
   set(name "")
   if(A_NAME)
@@ -114,7 +108,7 @@ function(o2_add_test)
                       NAME ${name}
                       DONT_FAIL_ON_TIMEOUT
                       MAX_ATTEMPTS ${A_MAX_ATTEMPTS}
-                      TIMEOUT ${A_TIMEOUT} ${nonFatal}
+                      TIMEOUT ${A_TIMEOUT}
                       WORKING_DIRECTORY ${A_WORKING_DIRECTORY}
                       COMMAND_LINE_ARGS ${A_COMMAND_LINE_ARGS}
                       LABELS ${A_LABELS}

cmake/O2AddTestRootMacro.cmake

@@ -20,8 +20,6 @@ include_guard()
 #   the macro test", a test to compile the library, i.e. using ".L macro.C++
 # * arg COMPILE_ONLY: if present we discard the "load the macro" test and
 #   only attempt the compilation test. It implies COMPILE
-# * arg NON_FATAL: if present mark the test as non_fatal, i.e. it won't
-#   invalidate the build
 # * arg ENVIRONMENT: sets the running environment for the generated test(s).
 # * arg PUBLIC_LINK_LIBRARIES: the list of targets this macro is depending on.
 #   Required to be able to specify correctly the include and library paths to
@@ -44,7 +42,7 @@ function(o2_add_test_root_macro macro)
     PARSE_ARGV
     1
     A
-    "NON_FATAL;COMPILE;COMPILE_ONLY"
+    "COMPILE;COMPILE_ONLY"
     ""
     "ENVIRONMENT;PUBLIC_LINK_LIBRARIES;PUBLIC_INCLUDE_DIRECTORIES;LABELS")
 
@@ -64,10 +62,6 @@ function(o2_add_test_root_macro macro)
 
   file(RELATIVE_PATH testName ${CMAKE_SOURCE_DIR} ${macroFileName})
 
-  if(${A_IS_NON_FATAL})
-    set(nonFatal "NON_FATAL")
-  endif()
-
   list(APPEND incdir $ENV{ROOT_INCLUDE_PATH})
   list(APPEND incdir ${A_PUBLIC_INCLUDE_DIRECTORIES})
 

cmake/O2AddTestWrapper.cmake

@@ -30,7 +30,6 @@ include_guard()
 # * TIMEOUT (optional) the test timeout (for each attempt)
 # * COMMAND_LINE_ARGS (optional) extra arguments to the test executable, if
 #   needed
-# * NON_FATAL (optional) mark the test as non criticial for the CI
 # * ENVIRONMENT: extra environment needed by the test to run properly
 #
 function(o2_add_test_wrapper)
@@ -43,7 +42,7 @@ function(o2_add_test_wrapper)
     PARSE_ARGV
     0
     "A"
-    "DONT_FAIL_ON_TIMEOUT;NON_FATAL"
+    "DONT_FAIL_ON_TIMEOUT"
     "TARGET;COMMAND;WORKING_DIRECTORY;MAX_ATTEMPTS;TIMEOUT;NAME"
     "COMMAND_LINE_ARGS;LABELS;CONFIGURATIONS;ENVIRONMENT")
 
@@ -86,9 +85,6 @@ function(o2_add_test_wrapper)
 #    message(
 #      WARNING "Test ${testName} will be retried max ${A_MAX_ATTEMPTS} times")
 #  endif()
-  if(A_NON_FATAL)
-    message(WARNING "Failure of test ${testName} will not be fatal")
-  endif()
 
   if(NOT A_TIMEOUT)
     set(A_TIMEOUT 100) # default timeout (seconds)
@@ -101,11 +97,6 @@ function(o2_add_test_wrapper)
   else()
     set(A_DONT_FAIL_ON_TIMEOUT "")
   endif()
-  if(A_NON_FATAL)
-    set(A_NON_FATAL "--non-fatal")
-  else()
-    set(A_NON_FATAL "")
-  endif()
 
   # For now, we enforce 3 max attempts for all tests.
   # No need to ignore time out, since we have 3 attempts
@@ -136,7 +127,6 @@ function(o2_add_test_wrapper)
                    "--timeout"
                    "${A_TIMEOUT}"
                    ${A_DONT_FAIA_ON_TIMEOUT}
-                   ${A_NON_FATAL}
                    "--"
                    ${testExe}
                    ${A_COMMAND_LINE_ARGS}

tests/tests-wrapper.sh.in

@@ -10,7 +10,6 @@
 MAX_ATTEMPTS=1
 TIMEOUT=              # default: no timeout
 DONT_FAIL_ON_TIMEOUT= # default: if it times out, it fails
-NON_FATAL=            # default: fail on error
 ARGS=("$@")
 
 while [[ $# -gt 0 ]]; do
@@ -35,10 +34,6 @@ while [[ $# -gt 0 ]]; do
     DONT_FAIL_ON_TIMEOUT=1
     shift
     ;;
-  --non-fatal)
-    NON_FATAL=1
-    shift
-    ;;
   *)
     echo "Parameter unknown: $1" >&2
     exit 1
@@ -63,7 +58,7 @@ function banner() {
   echo "=== $TEST_NAME - $1 ===" >&2
 }
 
-banner "Starting test. Max attempts: $MAX_ATTEMPTS.${TIMEOUT:+" Timeout per attempt: $TIMEOUT."}${DONT_FAIL_ON_TIMEOUT:+" Timeouts are not fatal."}${NON_FATAL:+" Errors are not fatal."}"
+banner "Starting test. Max attempts: $MAX_ATTEMPTS.${TIMEOUT:+" Timeout per attempt: $TIMEOUT."}${DONT_FAIL_ON_TIMEOUT:+" Timeouts are not fatal."}"
 
 for A in "${ARGS[@]}"; do
   banner "Argument: $A"
@@ -123,9 +118,5 @@ if [[ $DONT_FAIL_ON_TIMEOUT && $ERR == 124 ]]; then
   banner "Reason for failure: timeout, explicitly set as not fatal. Exiting with 0"
   cp "${LOG}.${ERR}" "${LOG}.${ERR}.nonfatal"
   exit 0
-elif [[ $NON_FATAL ]]; then
-  banner "Failed with error $ERR, but errors are set as not fatal. Exiting with 0"
-  cp "${LOG}.${ERR}" "${LOG}.${ERR}.nonfatal"
-  exit 0
 fi
 exit 1