From be551bdec512d12d06e974499d8d1934068b61fa Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 18 Jan 2024 21:08:51 -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_abstruse/data/build/testfile | 2 +- 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_compare/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_network/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_random/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_time/data/build/testfile | 2 +- level_0/f_type_array/data/build/testfile | 2 +- level_0/f_utf/data/build/testfile | 2 +- level_1/fl_fss/data/build/testfile | 63 ++++++++++++++++++++ level_1/fl_path/data/build/testfile | 2 +- level_1/fl_status_string/data/build/testfile | 2 +- 34 files changed, 96 insertions(+), 33 deletions(-) create mode 100644 level_1/fl_fss/data/build/testfile diff --git a/level_0/f_abstruse/data/build/testfile b/level_0/f_abstruse/data/build/testfile index dbeaf4fc9..6e313b18f 100644 --- a/level_0/f_abstruse/data/build/testfile +++ b/level_0/f_abstruse/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_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_compare/data/build/testfile b/level_0/f_compare/data/build/testfile index f0ea47510..3666fde7f 100644 --- a/level_0/f_compare/data/build/testfile +++ b/level_0/f_compare/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 8ff371860..ce3cec468 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 5f76e6457..250ffa066 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_network/data/build/testfile b/level_0/f_network/data/build/testfile index a21828e34..0af963c67 100644 --- a/level_0/f_network/data/build/testfile +++ b/level_0/f_network/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_random/data/build/testfile b/level_0/f_random/data/build/testfile index 709fd21d1..fff53284c 100644 --- a/level_0/f_random/data/build/testfile +++ b/level_0/f_random/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 a8d023895..ff9a887bb 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_time/data/build/testfile b/level_0/f_time/data/build/testfile index dd9b6d82f..d86b3efab 100644 --- a/level_0/f_time/data/build/testfile +++ b/level_0/f_time/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 7ea7fdbae..b2e4b27ad 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 57f59234a..07bf96916 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_fss/data/build/testfile b/level_1/fl_fss/data/build/testfile new file mode 100644 index 000000000..46f955147 --- /dev/null +++ b/level_1/fl_fss/data/build/testfile @@ -0,0 +1,63 @@ +# fss-0005 iki-0002 + +settings: + load_build yes + fail exit + + environment PATH LD_LIBRARY_PATH + environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH + 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. + #define CMOCKA_TEST_ABORT 1 + + # One of: STDOUT, SUBUNIT, TAP, or XML. + #define CMOCKA_MESSAGE_OUTPUT STDOUT + + # When in "XML" output mode, output to this file rather than stdout. + #define CMOCKA_XML_FILE ./out.xml + +main: + build settings individual test + build settings-tests individual test + + operate build_path + operate ld_library_path + + if exist parameter:"build_path"programs/shared/test-fl_fss + shell parameter:"build_path"programs/shared/test-fl_fss + + if exist parameter:"build_path"programs/static/test-fl_fss + shell parameter:"build_path"programs/static/test-fl_fss + + if not exist parameter:"build_path"programs/shared/test-fl_fss + and not exist parameter:"build_path"programs/static/test-fl_fss + operate not_created + +not_created: + print + print 'context:"error"Failed to test due to being unable to find either a shared or static test binary to perform tests. context:"reset"' + + exit failure + +build_path: + parameter build_path build/ + + if parameter build:value + parameter build_path parameter:"build:value" + +ld_library_path: + if define LD_LIBRARY_PATH + and parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared:define:"LD_LIBRARY_PATH"' + + else + if define LD_LIBRARY_PATH + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' + + else + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' + + else + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared' diff --git a/level_1/fl_path/data/build/testfile b/level_1/fl_path/data/build/testfile index 2427120af..895aebc41 100644 --- a/level_1/fl_path/data/build/testfile +++ b/level_1/fl_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_1/fl_status_string/data/build/testfile b/level_1/fl_status_string/data/build/testfile index 161ba3d5f..ca62e56f4 100644 --- a/level_1/fl_status_string/data/build/testfile +++ b/level_1/fl_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