Bugfix: Unit tests are not up to date.

These unit tests were not fully updated with the latest design change.

diff --git a/level_0/f_compare/data/build/settings-tests b/level_0/f_compare/data/build/settings-tests
index 8e963c2297b0f9135ccb3b11c98c1e93e1586903..b2642ba2f2b1c5b7ef70ae60b7c8ecbfa833d6d5 100644 (file)
--- 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 5cb6f9b51759d62e41ce802928a27c1ab5204b33..f0ea47510b059f9c93287678b48c23cff5c3ad9d 100644 (file)
--- 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 b49a94dedcf3dc6e634eace1f18a599dd2e61cd9..2427120aff8239bacfbf0f07c097cf7860e21ba1 100644 (file)
--- 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 a2037293481a4c581f5621e7afdc69647809316a..161ba3d5f2478432b666a3bb0454127996f7ee17 100644 (file)
--- 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'