From 10f1d3d63564ab7395f356f7f442f4f07268784a Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Wed, 7 Jun 2023 23:56:45 -0500 Subject: [PATCH] Bugfix: Unit tests are not up to date. These unit tests were not fully updated with the latest design change. --- level_0/f_compare/data/build/settings-tests | 11 ---------- level_0/f_compare/data/build/testfile | 30 +++++++++++++++++----------- level_1/fl_path/data/build/testfile | 30 +++++++++++++++++----------- level_1/fl_status_string/data/build/testfile | 30 +++++++++++++++++----------- 4 files changed, 54 insertions(+), 47 deletions(-) diff --git a/level_0/f_compare/data/build/settings-tests b/level_0/f_compare/data/build/settings-tests index 8e963c2..b2642ba 100644 --- a/level_0/f_compare/data/build/settings-tests +++ b/level_0/f_compare/data/build/settings-tests @@ -4,17 +4,6 @@ # # Memory leaks in the test program can be checked for by running valgrind with this executable. # -# Modes: -# - individual: Compile using per project (individual) libraries, does not handle thread or threadless cases. -# - individual_thread: This is required when compiling in individual mode with "thread" mode. -# - level: Compile using per level libraries. -# - monolithic: Compile using per monolithic libraries. -# - clang: Use clang rather than the default, which is generally gcc. -# - test: Compile for a test, such as unit testing. -# - fanalyzer: Compile using GCC's -fanalyzer compile time option. -# - thread: Compile with thread support. -# - threadless: Compile without thread support. -# build_name test-f_compare diff --git a/level_0/f_compare/data/build/testfile b/level_0/f_compare/data/build/testfile index 5cb6f9b..f0ea475 100644 --- a/level_0/f_compare/data/build/testfile +++ b/level_0/f_compare/data/build/testfile @@ -24,14 +24,14 @@ main: operate build_path operate ld_library_path - if exist build/programs/shared/test-f_compare - shell build/programs/shared/test-f_compare + if exist parameter:"build_path"programs/shared/test-f_compare + shell parameter:"build_path"programs/shared/test-f_compare - if exist build/programs/static/test-f_compare - shell build/programs/static/test-f_compare + if exist parameter:"build_path"programs/static/test-f_compare + shell parameter:"build_path"programs/static/test-f_compare - if not exist build/programs/shared/test-f_compare - and not exist build/programs/static/test-f_compare + if not exist parameter:"build_path"programs/shared/test-f_compare + and not exist parameter:"build_path"programs/static/test-f_compare operate not_created not_created: @@ -40,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 b49a94d..2427120 100644 --- a/level_1/fl_path/data/build/testfile +++ b/level_1/fl_path/data/build/testfile @@ -24,14 +24,14 @@ main: operate build_path operate ld_library_path - if exist build/programs/shared/test-fl_path - shell build/programs/shared/test-fl_path + if exist parameter:"build_path"programs/shared/test-fl_path + shell parameter:"build_path"programs/shared/test-fl_path - if exist build/programs/static/test-fl_path - shell build/programs/static/test-fl_path + if exist parameter:"build_path"programs/static/test-fl_path + shell parameter:"build_path"programs/static/test-fl_path - if not exist build/programs/shared/test-fl_path - and not exist build/programs/static/test-fl_path + if not exist parameter:"build_path"programs/shared/test-fl_path + and not exist parameter:"build_path"programs/static/test-fl_path operate not_created not_created: @@ -40,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_status_string/data/build/testfile b/level_1/fl_status_string/data/build/testfile index a203729..161ba3d 100644 --- a/level_1/fl_status_string/data/build/testfile +++ b/level_1/fl_status_string/data/build/testfile @@ -24,14 +24,14 @@ main: operate build_path operate ld_library_path - if exist build/programs/shared/test-fl_status_string - shell build/programs/shared/test-fl_status_string + if exist parameter:"build_path"programs/shared/test-fl_status_string + shell parameter:"build_path"programs/shared/test-fl_status_string - if exist build/programs/static/test-fl_status_string - shell build/programs/static/test-fl_status_string + if exist parameter:"build_path"programs/static/test-fl_status_string + shell parameter:"build_path"programs/static/test-fl_status_string - if not exist build/programs/shared/test-fl_status_string - and not exist build/programs/static/test-fl_status_string + if not exist parameter:"build_path"programs/shared/test-fl_status_string + and not exist parameter:"build_path"programs/static/test-fl_status_string operate not_created not_created: @@ -40,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' -- 1.8.3.1