handle environmental variables when we create folders dynamically to

test configuration file processing.

diff --git a/regression_test/cfgFile/define/macro_reference/Makefile b/regression_test/cfgFile/define/macro_reference/Makefile
index ae705982591106bc7c4160185f51bd399fd0837e..2966915969c078abe855ed0b09f214c6347150a8 100644 (file)
--- a/regression_test/cfgFile/define/macro_reference/Makefile
+++ b/regression_test/cfgFile/define/macro_reference/Makefile
@@ -32,6 +32,14 @@ ifeq ($(COVERAGE), yes)
   COVERAGE_FLAG += -C
 endif
 
+ifdef DYN
+ifeq ($(PLATFORM), WIN32)
+  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+else
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+endif 
+endif
+
 # List of fake targets:
 .PHONY: all clean run run_single run_parallel runall
 

diff --git a/regression_test/cfgFile/define/structured/Makefile b/regression_test/cfgFile/define/structured/Makefile
index 54799ef5fb093c2d77e40191ba249b99db5b7d98..8083105c2cd5c45dee1d3a704a79d8a01d3b9284 100644 (file)
--- a/regression_test/cfgFile/define/structured/Makefile
+++ b/regression_test/cfgFile/define/structured/Makefile
@@ -32,6 +32,14 @@ ifeq ($(COVERAGE), yes)
   COVERAGE_FLAG += -C
 endif
 
+ifdef DYN
+ifeq ($(PLATFORM), WIN32)
+  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+else
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+endif 
+endif
+
 # List of fake targets:
 .PHONY: all clean run run_single run_parallel runall
 

diff --git a/regression_test/cfgFile/module_parameters/assignment/Makefile b/regression_test/cfgFile/module_parameters/assignment/Makefile
index 3d03cc2af09bb6fd359b7c279955bde82f626c4e..6a21b841d1ba4b1da931fbbb2be9ea8cc258a522 100644 (file)
--- a/regression_test/cfgFile/module_parameters/assignment/Makefile
+++ b/regression_test/cfgFile/module_parameters/assignment/Makefile
@@ -27,6 +27,14 @@ ifeq ($(COVERAGE), yes)
   COVERAGE_FLAG += -C
 endif
 
+ifdef DYN
+ifeq ($(PLATFORM), WIN32)
+  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+else
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+endif 
+endif
+
 MAKE_PROG := $(MAKE)
 
 # List of fake targets:

diff --git a/regression_test/cfgFile/module_parameters/concat/Makefile b/regression_test/cfgFile/module_parameters/concat/Makefile
index 7e1f9dd611b92d124c603994fb26b87efb0670e6..c93301bfcf276d512611b18b5d7d40039eeda5b2 100644 (file)
--- a/regression_test/cfgFile/module_parameters/concat/Makefile
+++ b/regression_test/cfgFile/module_parameters/concat/Makefile
@@ -27,6 +27,14 @@ ifeq ($(COVERAGE), yes)
   COVERAGE_FLAG += -C
 endif
 
+ifdef DYN
+ifeq ($(PLATFORM), WIN32)
+  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+else
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+endif 
+endif
+
 MAKE_PROG := $(MAKE)
 
 # List of fake targets:

diff --git a/regression_test/cfgFile/module_parameters/references/Makefile b/regression_test/cfgFile/module_parameters/references/Makefile
index 8a76636d2622d2dd7264d02bd6b5cde60ce13d96..a9d2880bd968ab960c40f3fb58f7a5f5f3bd8b04 100644 (file)
--- a/regression_test/cfgFile/module_parameters/references/Makefile
+++ b/regression_test/cfgFile/module_parameters/references/Makefile
@@ -25,6 +25,14 @@ ifeq ($(COVERAGE), yes)
   COVERAGE_FLAG += -C
 endif
 
+ifdef DYN
+ifeq ($(PLATFORM), WIN32)
+  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+else
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+endif 
+endif
+
 MAKE_PROG := $(MAKE)
 
 # List of fake targets:

diff --git a/regression_test/cfgFile/ordered_include/Makefile b/regression_test/cfgFile/ordered_include/Makefile
index db9a55b2397a0c5bae8d69e73abc801f1cae2e9f..81c853fc687157414d31eaae58e3238d523f9eba 100644 (file)
--- a/regression_test/cfgFile/ordered_include/Makefile
+++ b/regression_test/cfgFile/ordered_include/Makefile
@@ -28,6 +28,14 @@ ifeq ($(COVERAGE), yes)
   COVERAGE_FLAG += -C
 endif
 
+ifdef DYN
+ifeq ($(PLATFORM), WIN32)
+  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+else
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+endif 
+endif
+
 MAKE_PROG := $(MAKE)
 
 # List of fake targets:

diff --git a/regression_test/cfgFile/testport_parameters/Makefile b/regression_test/cfgFile/testport_parameters/Makefile
index d777c7840723ffe41fbb77782200ee871063f183..6fa4a263bfcc6c7ffa24374efa8f27ded57f43c1 100644 (file)
--- a/regression_test/cfgFile/testport_parameters/Makefile
+++ b/regression_test/cfgFile/testport_parameters/Makefile
@@ -28,6 +28,14 @@ ifeq ($(COVERAGE), yes)
   COVERAGE_FLAG += -C
 endif
 
+ifdef DYN
+ifeq ($(PLATFORM), WIN32)
+  export PATH:=$(TTCN3_DIR)/lib:$(PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+else
+  export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(ABS_SRC)/$(DIR_SINGLE):$(ANS_SRC)/$(DIR_PARALLEL)
+endif 
+endif
+
 MAKE_PROG := $(MAKE)
 
 # List of fake targets: