From 97421534fdb969ab11201bd8d081a2dcb0fbbab8 Mon Sep 17 00:00:00 2001 From: kristof <Kristof.Szabados@ericsson.com> Date: Tue, 19 Apr 2016 15:18:08 +0200 Subject: [PATCH] handle environmental variables when we create folders dynamically to test configuration file processing. --- regression_test/cfgFile/define/macro_reference/Makefile | 8 ++++++++ regression_test/cfgFile/define/structured/Makefile | 8 ++++++++ .../cfgFile/module_parameters/assignment/Makefile | 8 ++++++++ regression_test/cfgFile/module_parameters/concat/Makefile | 8 ++++++++ .../cfgFile/module_parameters/references/Makefile | 8 ++++++++ regression_test/cfgFile/ordered_include/Makefile | 8 ++++++++ regression_test/cfgFile/testport_parameters/Makefile | 8 ++++++++ 7 files changed, 56 insertions(+) diff --git a/regression_test/cfgFile/define/macro_reference/Makefile b/regression_test/cfgFile/define/macro_reference/Makefile index ae7059825..296691596 100644 --- 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 54799ef5f..8083105c2 100644 --- 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 3d03cc2af..6a21b841d 100644 --- 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 7e1f9dd61..c93301bfc 100644 --- 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 8a76636d2..a9d2880bd 100644 --- 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 db9a55b23..81c853fc6 100644 --- 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 d777c7840..6fa4a263b 100644 --- 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: -- GitLab