From 5dc8ba5b9e67f9663a26cbb281bba4ba3cee8c2d Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Wed, 12 Apr 2017 13:58:42 +0200
Subject: [PATCH] Enabled RT2 function test setting through environment
variable and fixed 'negative testing' test
Change-Id: I362d623cf8f3206847f19a6608608627de9d20d4
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
---
function_test/Makefile | 4 ++--
.../Semantic_Analyser/TTCN3_SA_ttcn3adhoc_TD.script | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/function_test/Makefile b/function_test/Makefile
index 87001b79d..a34972cf1 100644
--- a/function_test/Makefile
+++ b/function_test/Makefile
@@ -26,8 +26,8 @@ LCOV := no
ifeq ($(LCOV), yes)
SCRIPTFLAGS += -coverage
endif
-# Runtime selection, doesn't have effect on BER/RAW tests yet
-RT2 := no
+# Runtime selection
+#RT2 := yes
ifeq ($(RT2), yes)
SCRIPTFLAGS += -rt2
endif
diff --git a/function_test/Semantic_Analyser/TTCN3_SA_ttcn3adhoc_TD.script b/function_test/Semantic_Analyser/TTCN3_SA_ttcn3adhoc_TD.script
index 54f5238b2..284efbf92 100644
--- a/function_test/Semantic_Analyser/TTCN3_SA_ttcn3adhoc_TD.script
+++ b/function_test/Semantic_Analyser/TTCN3_SA_ttcn3adhoc_TD.script
@@ -7305,10 +7305,6 @@ control {} with{erroneous ""}
(?im)\berror: A `raw' bitstring value was used for erroneous type `@virag.MYREC2' which has no RAW encoding.
<END_RESULT>
-<RESULT FTRT COUNT 1>
-(?im)\berror: Type `VisibleString' and type `@virag.MYREC' have no common encoding
-<END_RESULT>
-
<RESULT FTRT COUNT 1>
(?im)\berror: Type `@virag.MYREC2' and type `@virag.MYREC' have no common encoding
<END_RESULT>
@@ -7317,7 +7313,7 @@ control {} with{erroneous ""}
(?im)\berror: The `erroneous' attribute can be used only on template and constant definitions
<END_RESULT>
-<RESULT FTRT COUNT 33>
+<RESULT FTRT COUNT 32>
(?is)\berror:
<END_RESULT>
--
GitLab