From: Kevin Day Date: Mon, 29 May 2023 23:18:28 +0000 (-0500) Subject: Bugfix: The testfile needs to handle the --build parameter and improve --work paramet... X-Git-Tag: 0.7.0~524 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=c0bc7d0aa7f2b211887c7296c621804e3a32998f;p=fll Bugfix: The testfile needs to handle the --build parameter and improve --work parameter handling. Provide a new operation "build_path" to load the "--build" parameter properly. The existing checks for the "--work" parameter is better suited checking against "work:value" rather than "work". There may be an existing bug where the condition for "build" parameter is always returning true when it should not. This requires further investigation and is not addressed within the scope of this commit. --- diff --git a/level_0/f_account/data/build/testfile b/level_0/f_account/data/build/testfile index a6cb46455..311dd9167 100644 --- a/level_0/f_account/data/build/testfile +++ b/level_0/f_account/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_account - shell build/programs/shared/test-f_account + if exist parameter:"build_path"programs/shared/test-f_account + shell parameter:"build_path"programs/shared/test-f_account - if exist build/programs/static/test-f_account - shell build/programs/static/test-f_account + if exist parameter:"build_path"programs/static/test-f_account + shell parameter:"build_path"programs/static/test-f_account - if not exist build/programs/shared/test-f_account - and not exist build/programs/static/test-f_account + if not exist parameter:"build_path"programs/shared/test-f_account + and not exist parameter:"build_path"programs/static/test-f_account operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_capability/data/build/testfile b/level_0/f_capability/data/build/testfile index 3876f1abc..3dab4425e 100644 --- a/level_0/f_capability/data/build/testfile +++ b/level_0/f_capability/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_capability - shell build/programs/shared/test-f_capability + if exist parameter:"build_path"programs/shared/test-f_capability + shell parameter:"build_path"programs/shared/test-f_capability - if exist build/programs/static/test-f_capability - shell build/programs/static/test-f_capability + if exist parameter:"build_path"programs/static/test-f_capability + shell parameter:"build_path"programs/static/test-f_capability - if not exist build/programs/shared/test-f_capability - and not exist build/programs/static/test-f_capability + if not exist parameter:"build_path"programs/shared/test-f_capability + and not exist parameter:"build_path"programs/static/test-f_capability operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_color/data/build/testfile b/level_0/f_color/data/build/testfile index e89bbe412..5c845ad49 100644 --- a/level_0/f_color/data/build/testfile +++ b/level_0/f_color/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_color - shell build/programs/shared/test-f_color + if exist parameter:"build_path"programs/shared/test-f_color + shell parameter:"build_path"programs/shared/test-f_color - if exist build/programs/static/test-f_color - shell build/programs/static/test-f_color + if exist parameter:"build_path"programs/static/test-f_color + shell parameter:"build_path"programs/static/test-f_color - if not exist build/programs/shared/test-f_color - and not exist build/programs/static/test-f_color + if not exist parameter:"build_path"programs/shared/test-f_color + and not exist parameter:"build_path"programs/static/test-f_color operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_compare/data/build/testfile b/level_0/f_compare/data/build/testfile index f1a6f4231..5cb6f9b51 100644 --- a/level_0/f_compare/data/build/testfile +++ b/level_0/f_compare/data/build/testfile @@ -21,6 +21,7 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path if exist build/programs/shared/test-f_compare diff --git a/level_0/f_console/data/build/testfile b/level_0/f_console/data/build/testfile index 626d15f1b..2696bfdce 100644 --- a/level_0/f_console/data/build/testfile +++ b/level_0/f_console/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_console - shell build/programs/shared/test-f_console + if exist parameter:"build_path"programs/shared/test-f_console + shell parameter:"build_path"programs/shared/test-f_console - if exist build/programs/static/test-f_console - shell build/programs/static/test-f_console + if exist parameter:"build_path"programs/static/test-f_console + shell parameter:"build_path"programs/static/test-f_console - if not exist build/programs/shared/test-f_console - and not exist build/programs/static/test-f_console + if not exist parameter:"build_path"programs/shared/test-f_console + and not exist parameter:"build_path"programs/static/test-f_console operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_control_group/data/build/testfile b/level_0/f_control_group/data/build/testfile index 694ddd5a7..911c93588 100644 --- a/level_0/f_control_group/data/build/testfile +++ b/level_0/f_control_group/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_control_group - shell build/programs/shared/test-f_control_group + if exist parameter:"build_path"programs/shared/test-f_control_group + shell parameter:"build_path"programs/shared/test-f_control_group - if exist build/programs/static/test-f_control_group - shell build/programs/static/test-f_control_group + if exist parameter:"build_path"programs/static/test-f_control_group + shell parameter:"build_path"programs/static/test-f_control_group - if not exist build/programs/shared/test-f_control_group - and not exist build/programs/static/test-f_control_group + if not exist parameter:"build_path"programs/shared/test-f_control_group + and not exist parameter:"build_path"programs/static/test-f_control_group operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_conversion/data/build/testfile b/level_0/f_conversion/data/build/testfile index 5f2d91bee..475483453 100644 --- a/level_0/f_conversion/data/build/testfile +++ b/level_0/f_conversion/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_conversion - shell build/programs/shared/test-f_conversion + if exist parameter:"build_path"programs/shared/test-f_conversion + shell parameter:"build_path"programs/shared/test-f_conversion - if exist build/programs/static/test-f_conversion - shell build/programs/static/test-f_conversion + if exist parameter:"build_path"programs/static/test-f_conversion + shell parameter:"build_path"programs/static/test-f_conversion - if not exist build/programs/shared/test-f_conversion - and not exist build/programs/static/test-f_conversion + if not exist parameter:"build_path"programs/shared/test-f_conversion + and not exist parameter:"build_path"programs/static/test-f_conversion operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_directory/data/build/testfile b/level_0/f_directory/data/build/testfile index 7be1ca7b5..aebaf4802 100644 --- a/level_0/f_directory/data/build/testfile +++ b/level_0/f_directory/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_directory - shell build/programs/shared/test-f_directory + if exist parameter:"build_path"programs/shared/test-f_directory + shell parameter:"build_path"programs/shared/test-f_directory - if exist build/programs/static/test-f_directory - shell build/programs/static/test-f_directory + if exist parameter:"build_path"programs/static/test-f_directory + shell parameter:"build_path"programs/static/test-f_directory - if not exist build/programs/shared/test-f_directory - and not exist build/programs/static/test-f_directory + if not exist parameter:"build_path"programs/shared/test-f_directory + and not exist parameter:"build_path"programs/static/test-f_directory operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_environment/data/build/testfile b/level_0/f_environment/data/build/testfile index 4cabcf3a6..f5518f683 100644 --- a/level_0/f_environment/data/build/testfile +++ b/level_0/f_environment/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_environment - shell build/programs/shared/test-f_environment + if exist parameter:"build_path"programs/shared/test-f_environment + shell parameter:"build_path"programs/shared/test-f_environment - if exist build/programs/static/test-f_environment - shell build/programs/static/test-f_environment + if exist parameter:"build_path"programs/static/test-f_environment + shell parameter:"build_path"programs/static/test-f_environment - if not exist build/programs/shared/test-f_environment - and not exist build/programs/static/test-f_environment + if not exist parameter:"build_path"programs/shared/test-f_environment + and not exist parameter:"build_path"programs/static/test-f_environment operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_execute/data/build/testfile b/level_0/f_execute/data/build/testfile index 70fa165c4..c74684849 100644 --- a/level_0/f_execute/data/build/testfile +++ b/level_0/f_execute/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_execute - shell build/programs/shared/test-f_execute + if exist parameter:"build_path"programs/shared/test-f_execute + shell parameter:"build_path"programs/shared/test-f_execute - if exist build/programs/static/test-f_execute - shell build/programs/static/test-f_execute + if exist parameter:"build_path"programs/static/test-f_execute + shell parameter:"build_path"programs/static/test-f_execute - if not exist build/programs/shared/test-f_execute - and not exist build/programs/static/test-f_execute + if not exist parameter:"build_path"programs/shared/test-f_execute + and not exist parameter:"build_path"programs/static/test-f_execute operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_file/data/build/testfile b/level_0/f_file/data/build/testfile index 3f1072eea..443580fcd 100644 --- a/level_0/f_file/data/build/testfile +++ b/level_0/f_file/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_file - shell build/programs/shared/test-f_file + if exist parameter:"build_path"programs/shared/test-f_file + shell parameter:"build_path"programs/shared/test-f_file - if exist build/programs/static/test-f_file - shell build/programs/static/test-f_file + if exist parameter:"build_path"programs/static/test-f_file + shell parameter:"build_path"programs/static/test-f_file - if not exist build/programs/shared/test-f_file - and not exist build/programs/static/test-f_file + if not exist parameter:"build_path"programs/shared/test-f_file + and not exist parameter:"build_path"programs/static/test-f_file operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_fss/data/build/testfile b/level_0/f_fss/data/build/testfile index 93d5891e8..42f95915b 100644 --- a/level_0/f_fss/data/build/testfile +++ b/level_0/f_fss/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_fss - shell build/programs/shared/test-f_fss + if exist parameter:"build_path"programs/shared/test-f_fss + shell parameter:"build_path"programs/shared/test-f_fss - if exist build/programs/static/test-f_fss - shell build/programs/static/test-f_fss + if exist parameter:"build_path"programs/static/test-f_fss + shell parameter:"build_path"programs/static/test-f_fss - if not exist build/programs/shared/test-f_fss - and not exist build/programs/static/test-f_fss + if not exist parameter:"build_path"programs/shared/test-f_fss + and not exist parameter:"build_path"programs/static/test-f_fss operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_iki/data/build/testfile b/level_0/f_iki/data/build/testfile index b526c7f88..0249224f4 100644 --- a/level_0/f_iki/data/build/testfile +++ b/level_0/f_iki/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_iki - shell build/programs/shared/test-f_iki + if exist parameter:"build_path"programs/shared/test-f_iki + shell parameter:"build_path"programs/shared/test-f_iki - if exist build/programs/static/test-f_iki - shell build/programs/static/test-f_iki + if exist parameter:"build_path"programs/static/test-f_iki + shell parameter:"build_path"programs/static/test-f_iki - if not exist build/programs/shared/test-f_iki - and not exist build/programs/static/test-f_iki + if not exist parameter:"build_path"programs/shared/test-f_iki + and not exist parameter:"build_path"programs/static/test-f_iki operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_limit/data/build/testfile b/level_0/f_limit/data/build/testfile index b3900375a..9b2e74fbc 100644 --- a/level_0/f_limit/data/build/testfile +++ b/level_0/f_limit/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_limit - shell build/programs/shared/test-f_limit + if exist parameter:"build_path"programs/shared/test-f_limit + shell parameter:"build_path"programs/shared/test-f_limit - if exist build/programs/static/test-f_limit - shell build/programs/static/test-f_limit + if exist parameter:"build_path"programs/static/test-f_limit + shell parameter:"build_path"programs/static/test-f_limit - if not exist build/programs/shared/test-f_limit - and not exist build/programs/static/test-f_limit + if not exist parameter:"build_path"programs/shared/test-f_limit + and not exist parameter:"build_path"programs/static/test-f_limit operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_memory/data/build/testfile b/level_0/f_memory/data/build/testfile index 50e2f8edc..cbf543f45 100644 --- a/level_0/f_memory/data/build/testfile +++ b/level_0/f_memory/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_memory - shell build/programs/shared/test-f_memory + if exist parameter:"build_path"programs/shared/test-f_memory + shell parameter:"build_path"programs/shared/test-f_memory - if exist build/programs/static/test-f_memory - shell build/programs/static/test-f_memory + if exist parameter:"build_path"programs/static/test-f_memory + shell parameter:"build_path"programs/static/test-f_memory - if not exist build/programs/shared/test-f_memory - and not exist build/programs/static/test-f_memory + if not exist parameter:"build_path"programs/shared/test-f_memory + and not exist parameter:"build_path"programs/static/test-f_memory operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_path/data/build/testfile b/level_0/f_path/data/build/testfile index b51ff4c44..2d2e4f000 100644 --- a/level_0/f_path/data/build/testfile +++ b/level_0/f_path/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_path - shell build/programs/shared/test-f_path + if exist parameter:"build_path"programs/shared/test-f_path + shell parameter:"build_path"programs/shared/test-f_path - if exist build/programs/static/test-f_path - shell build/programs/static/test-f_path + if exist parameter:"build_path"programs/static/test-f_path + shell parameter:"build_path"programs/static/test-f_path - if not exist build/programs/shared/test-f_path - and not exist build/programs/static/test-f_path + if not exist parameter:"build_path"programs/shared/test-f_path + and not exist parameter:"build_path"programs/static/test-f_path operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_pipe/data/build/testfile b/level_0/f_pipe/data/build/testfile index 4713fe7bf..eabc6d467 100644 --- a/level_0/f_pipe/data/build/testfile +++ b/level_0/f_pipe/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_pipe - shell build/programs/shared/test-f_pipe + if exist parameter:"build_path"programs/shared/test-f_pipe + shell parameter:"build_path"programs/shared/test-f_pipe - if exist build/programs/static/test-f_pipe - shell build/programs/static/test-f_pipe + if exist parameter:"build_path"programs/static/test-f_pipe + shell parameter:"build_path"programs/static/test-f_pipe - if not exist build/programs/shared/test-f_pipe - and not exist build/programs/static/test-f_pipe + if not exist parameter:"build_path"programs/shared/test-f_pipe + and not exist parameter:"build_path"programs/static/test-f_pipe operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_print/data/build/testfile b/level_0/f_print/data/build/testfile index 1e3589069..9d95383b3 100644 --- a/level_0/f_print/data/build/testfile +++ b/level_0/f_print/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks build settings-tests + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_print - shell build/programs/shared/test-f_print + if exist parameter:"build_path"programs/shared/test-f_print + shell parameter:"build_path"programs/shared/test-f_print - if exist build/programs/static/test-f_print - shell build/programs/static/test-f_print + if exist parameter:"build_path"programs/static/test-f_print + shell parameter:"build_path"programs/static/test-f_print - if not exist build/programs/shared/test-f_print - and not exist build/programs/static/test-f_print + if not exist parameter:"build_path"programs/shared/test-f_print + and not exist parameter:"build_path"programs/static/test-f_print operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_serialize/data/build/testfile b/level_0/f_serialize/data/build/testfile index b0a2a5365..efd916758 100644 --- a/level_0/f_serialize/data/build/testfile +++ b/level_0/f_serialize/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_serialize - shell build/programs/shared/test-f_serialize + if exist parameter:"build_path"programs/shared/test-f_serialize + shell parameter:"build_path"programs/shared/test-f_serialize - if exist build/programs/static/test-f_serialize - shell build/programs/static/test-f_serialize + if exist parameter:"build_path"programs/static/test-f_serialize + shell parameter:"build_path"programs/static/test-f_serialize - if not exist build/programs/shared/test-f_serialize - and not exist build/programs/static/test-f_serialize + if not exist parameter:"build_path"programs/shared/test-f_serialize + and not exist parameter:"build_path"programs/static/test-f_serialize operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_signal/data/build/testfile b/level_0/f_signal/data/build/testfile index 2053c28ed..8cf423b2e 100644 --- a/level_0/f_signal/data/build/testfile +++ b/level_0/f_signal/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_signal - shell build/programs/shared/test-f_signal + if exist parameter:"build_path"programs/shared/test-f_signal + shell parameter:"build_path"programs/shared/test-f_signal - if exist build/programs/static/test-f_signal - shell build/programs/static/test-f_signal + if exist parameter:"build_path"programs/static/test-f_signal + shell parameter:"build_path"programs/static/test-f_signal - if not exist build/programs/shared/test-f_signal - and not exist build/programs/static/test-f_signal + if not exist parameter:"build_path"programs/shared/test-f_signal + and not exist parameter:"build_path"programs/static/test-f_signal operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_socket/data/build/testfile b/level_0/f_socket/data/build/testfile index 2f89d0c40..8129cfcb9 100644 --- a/level_0/f_socket/data/build/testfile +++ b/level_0/f_socket/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_socket - shell build/programs/shared/test-f_socket + if exist parameter:"build_path"programs/shared/test-f_socket + shell parameter:"build_path"programs/shared/test-f_socket - if exist build/programs/static/test-f_socket - shell build/programs/static/test-f_socket + if exist parameter:"build_path"programs/static/test-f_socket + shell parameter:"build_path"programs/static/test-f_socket - if not exist build/programs/shared/test-f_socket - and not exist build/programs/static/test-f_socket + if not exist parameter:"build_path"programs/shared/test-f_socket + and not exist parameter:"build_path"programs/static/test-f_socket operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_status/data/build/testfile b/level_0/f_status/data/build/testfile index 172a60c15..8d862fe0c 100644 --- a/level_0/f_status/data/build/testfile +++ b/level_0/f_status/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_status - shell build/programs/shared/test-f_status + if exist parameter:"build_path"programs/shared/test-f_status + shell parameter:"build_path"programs/shared/test-f_status - if exist build/programs/static/test-f_status - shell build/programs/static/test-f_status + if exist parameter:"build_path"programs/static/test-f_status + shell parameter:"build_path"programs/static/test-f_status - if not exist build/programs/shared/test-f_status - and not exist build/programs/static/test-f_status + if not exist parameter:"build_path"programs/shared/test-f_status + and not exist parameter:"build_path"programs/static/test-f_status operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_status_string/data/build/testfile b/level_0/f_status_string/data/build/testfile index 572a2734f..4b092aa1e 100644 --- a/level_0/f_status_string/data/build/testfile +++ b/level_0/f_status_string/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_status_string - shell build/programs/shared/test-f_status_string + if exist parameter:"build_path"programs/shared/test-f_status_string + shell parameter:"build_path"programs/shared/test-f_status_string - if exist build/programs/static/test-f_status_string - shell build/programs/static/test-f_status_string + if exist parameter:"build_path"programs/static/test-f_status_string + shell parameter:"build_path"programs/static/test-f_status_string - if not exist build/programs/shared/test-f_status_string - and not exist build/programs/static/test-f_status_string + if not exist parameter:"build_path"programs/shared/test-f_status_string + and not exist parameter:"build_path"programs/static/test-f_status_string operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_string/data/build/testfile b/level_0/f_string/data/build/testfile index b9bf2e2e9..ad92b3ef7 100644 --- a/level_0/f_string/data/build/testfile +++ b/level_0/f_string/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_string - shell build/programs/shared/test-f_string + if exist parameter:"build_path"programs/shared/test-f_string + shell parameter:"build_path"programs/shared/test-f_string - if exist build/programs/static/test-f_string - shell build/programs/static/test-f_string + if exist parameter:"build_path"programs/static/test-f_string + shell parameter:"build_path"programs/static/test-f_string - if not exist build/programs/shared/test-f_string - and not exist build/programs/static/test-f_string + if not exist parameter:"build_path"programs/shared/test-f_string + and not exist parameter:"build_path"programs/static/test-f_string operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_thread/data/build/testfile b/level_0/f_thread/data/build/testfile index 64861d99c..1275c4b92 100644 --- a/level_0/f_thread/data/build/testfile +++ b/level_0/f_thread/data/build/testfile @@ -21,16 +21,17 @@ main: build settings-mocks individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_thread - shell build/programs/shared/test-f_thread + if exist parameter:"build_path"programs/shared/test-f_thread + shell parameter:"build_path"programs/shared/test-f_thread - if exist build/programs/static/test-f_thread - shell build/programs/static/test-f_thread + if exist parameter:"build_path"programs/static/test-f_thread + shell parameter:"build_path"programs/static/test-f_thread - if not exist build/programs/shared/test-f_thread - and not exist build/programs/static/test-f_thread + if not exist parameter:"build_path"programs/shared/test-f_thread + and not exist parameter:"build_path"programs/static/test-f_thread operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_type_array/data/build/testfile b/level_0/f_type_array/data/build/testfile index 317d87363..92039d8f8 100644 --- a/level_0/f_type_array/data/build/testfile +++ b/level_0/f_type_array/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_type_array - shell build/programs/shared/test-f_type_array + if exist parameter:"build_path"programs/shared/test-f_type_array + shell parameter:"build_path"programs/shared/test-f_type_array - if exist build/programs/static/test-f_type_array - shell build/programs/static/test-f_type_array + if exist parameter:"build_path"programs/static/test-f_type_array + shell parameter:"build_path"programs/static/test-f_type_array - if not exist build/programs/shared/test-f_type_array - and not exist build/programs/static/test-f_type_array + if not exist parameter:"build_path"programs/shared/test-f_type_array + and not exist parameter:"build_path"programs/static/test-f_type_array operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + define LD_LIBRARY_PATH parameter:"build_path"libraries/shared diff --git a/level_0/f_utf/data/build/testfile b/level_0/f_utf/data/build/testfile index 3b613541e..a2cc9c17e 100644 --- a/level_0/f_utf/data/build/testfile +++ b/level_0/f_utf/data/build/testfile @@ -21,16 +21,17 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path - if exist build/programs/shared/test-f_utf - shell build/programs/shared/test-f_utf + if exist parameter:"build_path"programs/shared/test-f_utf + shell parameter:"build_path"programs/shared/test-f_utf - if exist build/programs/static/test-f_utf - shell build/programs/static/test-f_utf + if exist parameter:"build_path"programs/static/test-f_utf + shell parameter:"build_path"programs/static/test-f_utf - if not exist build/programs/shared/test-f_utf - and not exist build/programs/static/test-f_utf + if not exist parameter:"build_path"programs/shared/test-f_utf + and not exist parameter:"build_path"programs/static/test-f_utf operate not_created not_created: @@ -39,18 +40,24 @@ not_created: 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 - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' else - define LD_LIBRARY_PATH build/libraries/shared + 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 537ee0d4b..b49a94ded 100644 --- a/level_1/fl_path/data/build/testfile +++ b/level_1/fl_path/data/build/testfile @@ -21,6 +21,7 @@ main: build settings individual test build settings-tests individual test + operate build_path operate ld_library_path if exist build/programs/shared/test-fl_path diff --git a/level_1/fl_status_string/data/build/testfile b/level_1/fl_status_string/data/build/testfile index d62b69fe9..a20372934 100644 --- a/level_1/fl_status_string/data/build/testfile +++ b/level_1/fl_status_string/data/build/testfile @@ -18,9 +18,10 @@ settings: #define CMOCKA_XML_FILE ./out.xml main: - build settings individual tests + build settings individual test build settings-tests individual test + operate build_path operate ld_library_path if exist build/programs/shared/test-fl_status_string diff --git a/level_3/fake/data/projects/bzip2/1.0.8/fakefile b/level_3/fake/data/projects/bzip2/1.0.8/fakefile index 53f61e801..862afba0f 100644 --- a/level_3/fake/data/projects/bzip2/1.0.8/fakefile +++ b/level_3/fake/data/projects/bzip2/1.0.8/fakefile @@ -38,21 +38,27 @@ tests: print print Performing tests. + # Conditionally setup the build_path. + parameter build_path build/ + + if parameter build:value + parameter build_path parameter:"build:value" + # Conditionally setup the LD_LIBRARY_PATH to include the just compiled libraries. if define LD_LIBRARY_PATH - and parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared: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 'build/libraries/shared:define:"LD_LIBRARY_PATH"' + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:define:"LD_LIBRARY_PATH"' else - if parameter work - define LD_LIBRARY_PATH 'build/libraries/shared:parameter:"work:value"libraries/shared' + if parameter work:value + define LD_LIBRARY_PATH 'parameter:"build_path"libraries/shared:parameter:"work:value"libraries/shared' # Setup the PATH to use the just compiled programs. - define PATH programs/static:programs/shared:define:"PATH" + define PATH parameter:"build_path"programs/static:parameter:"build_path"programs/shared:define:"PATH" # Execute the tests (redirects are not currently supported, so execute using bash). run cat words1