Bugfix: The testfile needs to handle the --build parameter and improve --work paramet...

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 a6cb464552f53efc7d768209f65d889098c73fa7..311dd9167b51dbe92b54d065e52a1cdaa958e8e6 100644 (file)
--- 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 3876f1abcd9e3cd4c2a92663b3e67abe908a900e..3dab4425e730bae7eeb13f884d84499649d6194d 100644 (file)
--- 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 e89bbe412805f39590d8ab145f6e3ac6df728768..5c845ad4997de54d519940436233772814f972bb 100644 (file)
--- 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 f1a6f423185678a95a36c8dd6fed9e67c138b5ec..5cb6f9b51759d62e41ce802928a27c1ab5204b33 100644 (file)
--- 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 626d15f1b166e5124509308457a6dda497196588..2696bfdce0b5d7a81a63da09f1e15c527d721e69 100644 (file)
--- 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 694ddd5a7bacdbde8fce97fc283b1a1a9c988944..911c93588fe02b98114a981de8b503a78ec61caf 100644 (file)
--- 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 5f2d91beef84c2d282015af757260317ad38de60..475483453571bf61fdd082cebed9c2951182cbc2 100644 (file)
--- 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 7be1ca7b521c2a147b880d6fb014862a9c865e07..aebaf4802d20358414450c14cd1055016fe759a2 100644 (file)
--- 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 4cabcf3a67eb68c23707a0e82d49865e296252ef..f5518f683f269487343df18082011bf98be8d6a4 100644 (file)
--- 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 70fa165c47e7bda03781ecb9644b033cac35ffef..c74684849843c94bb4a678915f4d2a3a89765990 100644 (file)
--- 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 3f1072eea0344a48d6085c2dd9410088fd9b704c..443580fcd5acd820e8818232e5add92cd6b67663 100644 (file)
--- 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 93d5891e849d934e3ba27c6c807d4e4f44c304d2..42f95915becbfbc85c3d648c0bb7db005f65c154 100644 (file)
--- 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 b526c7f881ddd1e4cb6c84570b38cf011400f41a..0249224f48af9fb6646b70a2d2dadd735b10a240 100644 (file)
--- 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 b3900375aeda65a9eac82ec36234f6b7d34379ad..9b2e74fbce1036e19597e6adbac3438f0905e59b 100644 (file)
--- 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 50e2f8edc744fcab9ceec283e15697ab38dcf814..cbf543f45992e3a87d9f68dc5be788ad469fbb63 100644 (file)
--- 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 b51ff4c444f0d61b6575857956fd28baa559656d..2d2e4f0002e85f45e22897f31531706e386fc0b5 100644 (file)
--- 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 4713fe7bf2f00233c5d54643ca37d3249b8d88be..eabc6d4670a262afc6ed87a09949f0ff4c2c6847 100644 (file)
--- 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 1e3589069e4a3846e6579aad2a128d84a0784a4d..9d95383b3c3281a60429ecf68831dcaabcbca142 100644 (file)
--- 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 b0a2a5365785381400167383ac389a797bbb7737..efd916758024aa752f48bfd141b4ee68e31a1099 100644 (file)
--- 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 2053c28edeba20e13a00e62eeca2b5763b50ccdc..8cf423b2e6b3126ef6c107acfd0bb6e5dcf0f61c 100644 (file)
--- 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 2f89d0c40c3295af80b1b492b32dd0cd1acf80d5..8129cfcb9cd20735016f93da6bef687774fb5666 100644 (file)
--- 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 172a60c150ed98ffbfb116e84edfccfe5ddf4845..8d862fe0ccfd9b6ba1c7f010e41e71a664212e92 100644 (file)
--- 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 572a2734f861098e7dc8f937a5692089f71c8647..4b092aa1e688374afbe5160ed6bef9b2355e568c 100644 (file)
--- 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 b9bf2e2e9afe88739c893fb4ee4607d1a7ed8430..ad92b3ef7552ec2f7b093d936bc08ffcedc7b958 100644 (file)
--- 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 64861d99c090e4d24cf0fde2dd2f2736678409c2..1275c4b924579274b6dac7c4fbe6f354fd65467d 100644 (file)
--- 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 317d87363aa239cc3aae4f071f41be973e32f5f2..92039d8f88e6d20f100160c4e6f34a5f0adaf031 100644 (file)
--- 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 3b613541e6f6648cd8e411d92790b4700f959c12..a2cc9c17eb978f10590728f668cece11b4d015f7 100644 (file)
--- 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 537ee0d4b83614e985a8606065053cbcf97a00e4..b49a94dedcf3dc6e634eace1f18a599dd2e61cd9 100644 (file)
--- 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 d62b69fe9f942171a339913d2c07270e38a17d80..a2037293481a4c581f5621e7afdc69647809316a 100644 (file)
--- 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 53f61e8013062b49882ecebc2184a17608bd0178..862afba0f501cecb1310a67378323cc1567013dc 100644 (file)
--- 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