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 b7028b6..95c9233 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 65e0d73..811910c 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 da59b1b..d669e68 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 19c5c84..75337f0 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 8db2496..46d4726 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 21827fc..f82f999 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 e0a9efa..81d097a 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 1b48cbc..4b2cb0b 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 d767443..ffcb99a 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 8874f87..c276392 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 f89f284..d53f122 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 23f5824..c94813d 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 0649d12..fa0e4e3 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 5c840b5..a92d8eb 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 35fe5d1..7093544 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 dd642bb..abfa47a 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 4e0e9bd..ab231f1 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 226008a..ab9c1c5 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 3129844..f763e1f 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 2bb3113..b6ede7b 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 7e27796..5091096 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 d3d0c1d..3894183 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 6b6a307..551b30b 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 00dd945..70494fa 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 31594b9..c2ebd4d 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 2fc47dc..60e64ac 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 3e8ad4f..137b22a 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 4207ea6..2286a4a 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 dd9b0dc..914abfa 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 0981278..5685027 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 -- 1.8.3.1