From b1898d0b0d2f6caf6a3597dad94f62cc7627ad9b Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 18 Jan 2024 21:07:32 -0600 Subject: [PATCH] Cleanup: Invalid environment define "CMOCKA_TEST_ABORT" in testfiles. This invalid configuration doesn't break anything unless someone uncomments it. Then, the expected functionality does not happen. The fix is easy, just add "define " at the start of that line to the right of the comment character. --- level_0/f_account/data/build/testfile | 2 +- level_0/f_capability/data/build/testfile | 2 +- level_0/f_color/data/build/testfile | 2 +- level_0/f_console/data/build/testfile | 2 +- level_0/f_control_group/data/build/testfile | 2 +- level_0/f_conversion/data/build/testfile | 2 +- level_0/f_directory/data/build/testfile | 2 +- level_0/f_environment/data/build/testfile | 2 +- level_0/f_execute/data/build/testfile | 2 +- level_0/f_file/data/build/testfile | 2 +- level_0/f_fss/data/build/testfile | 2 +- level_0/f_iki/data/build/testfile | 2 +- level_0/f_limit/data/build/testfile | 2 +- level_0/f_memory/data/build/testfile | 2 +- level_0/f_path/data/build/testfile | 2 +- level_0/f_pipe/data/build/testfile | 2 +- level_0/f_print/data/build/testfile | 2 +- level_0/f_serialize/data/build/testfile | 2 +- level_0/f_signal/data/build/testfile | 2 +- level_0/f_socket/data/build/testfile | 2 +- level_0/f_status/data/build/testfile | 2 +- level_0/f_status_string/data/build/testfile | 2 +- level_0/f_string/data/build/testfile | 2 +- level_0/f_thread/data/build/testfile | 2 +- level_0/f_type_array/data/build/testfile | 2 +- level_0/f_utf/data/build/testfile | 2 +- level_1/fl_string/data/build/testfile | 2 +- level_1/fl_utf/data/build/testfile | 2 +- level_2/fll_path/data/build/testfile | 2 +- level_2/fll_status_string/data/build/testfile | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/level_0/f_account/data/build/testfile b/level_0/f_account/data/build/testfile index b7028b636..95c923386 100644 --- a/level_0/f_account/data/build/testfile +++ b/level_0/f_account/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_capability/data/build/testfile b/level_0/f_capability/data/build/testfile index 65e0d73c6..811910c61 100644 --- a/level_0/f_capability/data/build/testfile +++ b/level_0/f_capability/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_color/data/build/testfile b/level_0/f_color/data/build/testfile index da59b1b35..d669e686d 100644 --- a/level_0/f_color/data/build/testfile +++ b/level_0/f_color/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_console/data/build/testfile b/level_0/f_console/data/build/testfile index 19c5c84d3..75337f0d9 100644 --- a/level_0/f_console/data/build/testfile +++ b/level_0/f_console/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_control_group/data/build/testfile b/level_0/f_control_group/data/build/testfile index 8db249689..46d472603 100644 --- a/level_0/f_control_group/data/build/testfile +++ b/level_0/f_control_group/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_conversion/data/build/testfile b/level_0/f_conversion/data/build/testfile index 21827fca9..f82f99976 100644 --- a/level_0/f_conversion/data/build/testfile +++ b/level_0/f_conversion/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_directory/data/build/testfile b/level_0/f_directory/data/build/testfile index e0a9efa7e..81d097ae6 100644 --- a/level_0/f_directory/data/build/testfile +++ b/level_0/f_directory/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_environment/data/build/testfile b/level_0/f_environment/data/build/testfile index 1b48cbcb5..4b2cb0bf4 100644 --- a/level_0/f_environment/data/build/testfile +++ b/level_0/f_environment/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_execute/data/build/testfile b/level_0/f_execute/data/build/testfile index d7674438d..ffcb99a3b 100644 --- a/level_0/f_execute/data/build/testfile +++ b/level_0/f_execute/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_file/data/build/testfile b/level_0/f_file/data/build/testfile index 8874f8712..c2763922a 100644 --- a/level_0/f_file/data/build/testfile +++ b/level_0/f_file/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_fss/data/build/testfile b/level_0/f_fss/data/build/testfile index f89f2848d..d53f12239 100644 --- a/level_0/f_fss/data/build/testfile +++ b/level_0/f_fss/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_iki/data/build/testfile b/level_0/f_iki/data/build/testfile index 23f582464..c94813de9 100644 --- a/level_0/f_iki/data/build/testfile +++ b/level_0/f_iki/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_limit/data/build/testfile b/level_0/f_limit/data/build/testfile index 0649d1291..fa0e4e34d 100644 --- a/level_0/f_limit/data/build/testfile +++ b/level_0/f_limit/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_memory/data/build/testfile b/level_0/f_memory/data/build/testfile index 5c840b540..a92d8eb9e 100644 --- a/level_0/f_memory/data/build/testfile +++ b/level_0/f_memory/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_path/data/build/testfile b/level_0/f_path/data/build/testfile index 35fe5d102..709354457 100644 --- a/level_0/f_path/data/build/testfile +++ b/level_0/f_path/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_pipe/data/build/testfile b/level_0/f_pipe/data/build/testfile index dd642bb05..abfa47a3d 100644 --- a/level_0/f_pipe/data/build/testfile +++ b/level_0/f_pipe/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_print/data/build/testfile b/level_0/f_print/data/build/testfile index 4e0e9bd25..ab231f1ec 100644 --- a/level_0/f_print/data/build/testfile +++ b/level_0/f_print/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_serialize/data/build/testfile b/level_0/f_serialize/data/build/testfile index 226008a1e..ab9c1c51c 100644 --- a/level_0/f_serialize/data/build/testfile +++ b/level_0/f_serialize/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_signal/data/build/testfile b/level_0/f_signal/data/build/testfile index 3129844c4..f763e1f48 100644 --- a/level_0/f_signal/data/build/testfile +++ b/level_0/f_signal/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_socket/data/build/testfile b/level_0/f_socket/data/build/testfile index 2bb311381..b6ede7b34 100644 --- a/level_0/f_socket/data/build/testfile +++ b/level_0/f_socket/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_status/data/build/testfile b/level_0/f_status/data/build/testfile index 7e27796c9..5091096ad 100644 --- a/level_0/f_status/data/build/testfile +++ b/level_0/f_status/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_status_string/data/build/testfile b/level_0/f_status_string/data/build/testfile index d3d0c1d40..3894183fd 100644 --- a/level_0/f_status_string/data/build/testfile +++ b/level_0/f_status_string/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_string/data/build/testfile b/level_0/f_string/data/build/testfile index 6b6a307fc..551b30b8a 100644 --- a/level_0/f_string/data/build/testfile +++ b/level_0/f_string/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_thread/data/build/testfile b/level_0/f_thread/data/build/testfile index 00dd9457b..70494fa38 100644 --- a/level_0/f_thread/data/build/testfile +++ b/level_0/f_thread/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_type_array/data/build/testfile b/level_0/f_type_array/data/build/testfile index 31594b9b1..c2ebd4d31 100644 --- a/level_0/f_type_array/data/build/testfile +++ b/level_0/f_type_array/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_0/f_utf/data/build/testfile b/level_0/f_utf/data/build/testfile index 2fc47dc78..60e64ac04 100644 --- a/level_0/f_utf/data/build/testfile +++ b/level_0/f_utf/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_1/fl_string/data/build/testfile b/level_1/fl_string/data/build/testfile index 3e8ad4fff..137b22a0a 100644 --- a/level_1/fl_string/data/build/testfile +++ b/level_1/fl_string/data/build/testfile @@ -8,7 +8,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_1/fl_utf/data/build/testfile b/level_1/fl_utf/data/build/testfile index 4207ea6d7..2286a4a95 100644 --- a/level_1/fl_utf/data/build/testfile +++ b/level_1/fl_utf/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_2/fll_path/data/build/testfile b/level_2/fll_path/data/build/testfile index dd9b0dc9d..914abfa34 100644 --- a/level_2/fll_path/data/build/testfile +++ b/level_2/fll_path/data/build/testfile @@ -8,7 +8,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT diff --git a/level_2/fll_status_string/data/build/testfile b/level_2/fll_status_string/data/build/testfile index 0981278df..5685027bd 100644 --- a/level_2/fll_status_string/data/build/testfile +++ b/level_2/fll_status_string/data/build/testfile @@ -9,7 +9,7 @@ settings: environment CMOCKA_XML_FILE CMOCKA_MESSAGE_OUTPUT CMOCKA_TEST_ABORT # Cmocka is not fully thread-safe, set this to "1" to have cmocka call abort() on a test failure. - #CMOCKA_TEST_ABORT 1 + #define CMOCKA_TEST_ABORT 1 # One of: STDOUT, SUBUNIT, TAP, or XML. #define CMOCKA_MESSAGE_OUTPUT STDOUT -- 2.47.3