From 9030d0c21141d594de4910c83beb3dfe1c501ba1 Mon Sep 17 00:00:00 2001 From: Botond Baranyi <botond.baranyi@ericsson.com> Date: Fri, 5 May 2017 16:03:41 +0200 Subject: [PATCH] Changed function test runtime selection method to match method used by Jenkins Change-Id: I99339ad4f69694bac49dd418fbd2caf11ebe7443 Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com> --- function_test/Makefile | 2 +- function_test/Semantic_Analyser/Makefile.semantic | 2 +- function_test/Semantic_Analyser/common.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/function_test/Makefile b/function_test/Makefile index a34972cf1..124e453da 100644 --- a/function_test/Makefile +++ b/function_test/Makefile @@ -28,7 +28,7 @@ SCRIPTFLAGS += -coverage endif # Runtime selection #RT2 := yes -ifeq ($(RT2), yes) +ifdef RT2 SCRIPTFLAGS += -rt2 endif diff --git a/function_test/Semantic_Analyser/Makefile.semantic b/function_test/Semantic_Analyser/Makefile.semantic index 5da604a0d..dc3b085da 100644 --- a/function_test/Semantic_Analyser/Makefile.semantic +++ b/function_test/Semantic_Analyser/Makefile.semantic @@ -14,7 +14,7 @@ ############################################################################## SADIRS := ver xer encode param template any_from pattern_ref float recof_index \ port_translation -ifeq ($(RT2), yes) +ifdef RT2 SADIRS += deprecated erroneous_attributes template_concat endif #$(wildcard TTCN3_[a0-9]* ASN_[a0-9]*) ver xer diff --git a/function_test/Semantic_Analyser/common.mk b/function_test/Semantic_Analyser/common.mk index 4ce105e4b..ad95d6e8a 100644 --- a/function_test/Semantic_Analyser/common.mk +++ b/function_test/Semantic_Analyser/common.mk @@ -17,7 +17,7 @@ # Flags for the TTCN-3 and ASN.1 compiler: COMPILER_FLAGS := -s -g -ifeq ($(RT2), yes) +ifdef RT2 COMPILER_FLAGS += -R endif -- GitLab