From: Kevin Day Date: Fri, 19 Jan 2024 03:08:51 +0000 (-0600) Subject: Cleanup: Invalid environment define "CMOCKA_TEST_ABORT" in testfiles. X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=be551bdec512d12d06e974499d8d1934068b61fa;p=fll 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. --- diff --git a/level_0/f_abstruse/data/build/testfile b/level_0/f_abstruse/data/build/testfile index dbeaf4f..6e313b1 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 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_compare/data/build/testfile b/level_0/f_compare/data/build/testfile index f0ea475..3666fde 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 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 8ff3718..ce3cec4 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 5f76e64..250ffa0 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_network/data/build/testfile b/level_0/f_network/data/build/testfile index a21828e..0af963c 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 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_random/data/build/testfile b/level_0/f_random/data/build/testfile index 709fd21..fff5328 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 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 a8d0238..ff9a887 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_time/data/build/testfile b/level_0/f_time/data/build/testfile index dd9b6d8..d86b3ef 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 7ea7fdb..b2e4b27 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 57f5923..07bf969 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 0000000..46f9551 --- /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 2427120..895aebc 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 161ba3d..ca62e56 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