Makefiles corrected to check overall verdict + RAW_EncDec/Makefile changed to handle dynamic tests

Signed-off-by: balaskoa <Jeno.Balasko@ericsson.com>
Change-Id: I16a281aaf81d5a90765026d50cddafaebd3345a6

regression_test/EncodeDecode/BER/Makefile

@@ -65,7 +65,9 @@ dep: $(GENERATED_SOURCES)
 	makedepend $(CPPFLAGS) $(USER_SOURCES) $(GENERATED_SOURCES)
 
 run: $(TARGET) BER.cfg
-	./$^
+	./$^ 2> result.txt
+	cat result.txt
+	grep "Overall verdict: pass" result.txt
 
 ifdef SRCDIR
 $(foreach src, $(USER_SOURCES), $(eval vpath $(src) $(ABS_SRC)))

regression_test/EncodeDecode/RAW/Annex_E_variants/Makefile

@@ -60,6 +60,8 @@ dep: $(GENERATED_SOURCES)
 	makedepend $(CPPFLAGS) $(USER_SOURCES) $(GENERATED_SOURCES)
 
 run: $(TARGET) Annex_E_variants.cfg
-	./$^
+	./$^ 2> result.txt
+	cat result.txt
+	grep "Overall verdict: pass" result.txt
 
 # DO NOT DELETE

regression_test/EncodeDecode/RAW/Bug521125/Makefile

@@ -144,4 +144,6 @@ diag:
 #
 
 run: $(TARGET) ./config.cfg
-	./$^
+	./$^ 2> result.txt
+	cat result.txt
+	grep "Overall verdict: pass" result.txt

regression_test/EncodeDecode/RAW/Bug522656/Makefile

@@ -144,4 +144,6 @@ diag:
 #
 
 run: $(TARGET) ./config.cfg
-	./$^
+	./$^ 2> result.txt
+	cat result.txt
+	grep "Overall verdict: pass" result.txt

regression_test/EncodeDecode/RAW/Bug546231/Makefile

@@ -144,4 +144,6 @@ diag:
 #
 
 run: $(TARGET) ./config.cfg
-	./$^
+	./$^ 2> result.txt
+	cat result.txt
+	grep "Overall verdict: pass" result.txt

regression_test/EncodeDecode/RAW/Bug547385/Makefile

@@ -144,4 +144,6 @@ diag:
 #
 
 run: $(TARGET) ./config.cfg
-	./$^
+	./$^ 2> result.txt
+	cat result.txt
+	grep "Overall verdict: pass" result.txt

regression_test/EncodeDecode/RAW/CSN1_LH/Makefile

@@ -58,6 +58,8 @@ dep: $(GENERATED_SOURCES)
 	makedepend $(CPPFLAGS) $(USER_SOURCES) $(GENERATED_SOURCES)
 
 run: $(TARGET) CSN1_LH.cfg
-	./$^
+	./$^ 2> result.txt
+	cat result.txt
+	grep "Overall verdict: pass" result.txt
 
 # DO NOT DELETE

regression_test/EncodeDecode/RAW/RAW_EncDec/Makefile

 ##############################################################################
-# Copyright (c) 2000-2020 Ericsson Telecom AB
+# Copyright (c) 2000-2019 Ericsson Telecom AB
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
 # https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 # Contributors:
-#   Balasko, Jeno
-#   Delic, Adam
-#   Hanko, Matyas
-#   Kovacs, Ferenc
-#   Lovassy, Arpad
-#   Ormandi, Matyas
-#   Raduly, Csaba
-#   Szabados, Kristof
+#   Szabo, Bence Janos
 #
 ##############################################################################
-# This Makefile was generated by the compiler
-# of the TTCN-3 Test Executor version 1.5.pl1
-# for Matyas Hanko (ethmhk@duna61) on Tue Nov  4 13:50:16 2003
-
-# The following make commands are available:
-# - make, make all       Builds the executable test suite.
-# - make compile         Translates TTCN-3 and ASN.1 modules to C++.
-# - make clean           Removes all generated files.
-# - make dep             Creates/updates dependency list.
-# - make archive         Archives all source files.
-# - make run             Runs the test with RAW_EncDec.cfg
-TOPDIR := ../../..
+TOPDIR := ../../../
 include $(TOPDIR)/Makefile.regression
 
-.PHONY: run
-
-# The path of your TTCN-3 Test Executor installation:
-# Uncomment this line to override the environment variable.
-# TTCN3_DIR =
-
-# Your platform: (SOLARIS, LINUX, FREEBSD or WIN32)
-ifndef PLATFORM
-PLATFORM = SOLARIS
-endif
-
-# Your C++ compiler:
-#CXX = g++
+.SUFFIXES: .ttcn .asn .hh
+.PHONY: all clean dep run
 
-# Flags for the C++ preprocessor (and makedepend as well):
-CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)/include -I$(XMLDIR)/include/libxml2
-ifdef RT2
-CPPFLAGS += -DTITAN_RUNTIME_2
-endif
-ifeq ($(DEBUG), yes)
-CPPFLAGS += -DMEMORY_DEBUG
-endif
-
-# Flags for the C++ compiler:
-CXXFLAGS = -Wall
+TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX)
 
-# Flags for the linker:
-LDFLAGS =
-
-# Flags for the TTCN-3 and ASN.1 compiler:
-COMPILER_FLAGS = -L
-ifdef RT2
-COMPILER_FLAGS += -R
-endif
-
-# Execution mode: (either ttcn3 or ttcn3-parallel)
-ifndef RT2
-TTCN3_LIB = ttcn3
-else
-TTCN3_LIB = ttcn3-rt2
-endif
-
-# The path of your OpenSSL installation:
-# If you do not have your own one, leave it unchanged.
-OPENSSL_DIR = $(TTCN3_DIR)
-
-# Directory to store the archived source files:
-# Note: you can set any directory except ./archive
-ARCHIVE_DIR = ./backup
-
-#
-# You may change these variables. Add your files if necessary...
-#
-
-# The TTCN-3 modules needed for this project:
 TTCN3_MODULES = RAW_EncDec_1.ttcn RAW_EncDec_2.ttcn RAW_EncDec_3.ttcn RAW_EncDec_4.ttcn RAW_EncDec_5.ttcn RAW_EncDec_6.ttcn RAW_EncDec_7.ttcn RAW_EncDec_8.ttcn
 
-# The ASN.1 modules needed for this project:
-ASN1_MODULES =
-
-# C++ source & header files generated by TTCN-3 & ASN.1 compilers:
-GENERATED_SOURCES = RAW_EncDec_1.cc RAW_EncDec_2.cc RAW_EncDec_3.cc RAW_EncDec_4.cc RAW_EncDec_5.cc RAW_EncDec_6.cc RAW_EncDec_7.cc RAW_EncDec_8.cc
-GENERATED_HEADERS = RAW_EncDec_1.hh RAW_EncDec_2.hh RAW_EncDec_3.hh RAW_EncDec_4.hh RAW_EncDec_5.hh RAW_EncDec_6.hh RAW_EncDec_7.hh RAW_EncDec_8.hh
+ASN1_MODULES = 
 
-# Source & header files of Test Ports and your other modules:
-USER_SOURCES =
-USER_HEADERS =
+GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc)
 
-# All object files needed for the executable test suite:
-OBJECTS = $(GENERATED_OBJECTS)
-
-GENERATED_OBJECTS = RAW_EncDec_1.o RAW_EncDec_2.o RAW_EncDec_3.o RAW_EncDec_4.o RAW_EncDec_5.o RAW_EncDec_6.o RAW_EncDec_7.o RAW_EncDec_8.o
-
-# The name of the executable test suite:
-TARGET = RAW_EncDec.exe
-
-ifeq ($(COVERAGE), yes)
-CPPFLAGS += -fprofile-arcs -ftest-coverage -g
-CXXFLAGS += -fprofile-arcs -ftest-coverage -g
-LDFLAGS += -fprofile-arcs -ftest-coverage -g -lgcov
+GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh)
+ifdef CODE_SPLIT
+GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc  _seqof.cc _setof.cc _union.cc))
+else ifdef SPLIT_TO_SLICES
+POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_))
+POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc))
+GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES)))
+GENERATED_SOURCES += $(GENERATED_SOURCES2)
 endif
 
-#
-# Do not modify these unless you know what you are doing...
-#
-SOLARIS_LIBS = -lxnet -L$(XMLDIR)/lib -lxml2 -lcurses
-SOLARIS8_LIBS = -lxnet -L$(XMLDIR)/lib -lxml2 -lnsl -lsocket -lresolv -lcurses
-LINUX_LIBS = -L$(XMLDIR)/lib -lxml2 -lpthread -lrt -lncurses
-FREEBSD_LIBS = -L$(XMLDIR)/lib -lxml2 -lncurses
-WIN32_LIBS = -L$(XMLDIR)/lib -lxml2 -lncurses
+OBJECTS = $(GENERATED_SOURCES:.cc=.o)
 
-#
-# Rules for building the executable...
-#
-all: $(TARGET) ;
+TARGET = RAW_EncDec$(EXESUFFIX)
 
-$(TARGET): $(OBJECTS)
-	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \
-	-L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS)
+all: $(TARGET)
 
-.cc.o .c.o:
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
+$(TARGET): $(GENERATED_SOURCES) $(USER_SOURCES)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) -L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS)
 
 $(GENERATED_SOURCES) $(GENERATED_HEADERS): compile
-	@if [ ! -f $@ ]; then $(RM) compile; $(MAKE) compile; fi
 
 compile: $(TTCN3_MODULES) $(ASN1_MODULES)
-	$(TTCN3_DIR)/bin/compiler $(COMPILER_FLAGS) $(TTCN3_MODULES) \
-	$(ASN1_MODULES) - $?
-	touch $@
-
-run: $(TARGET) RAW_EncDec.cfg
-	./$^ 2> result.txt
-	cat result.txt
-	grep "Overall verdict: pass" result.txt
+	$(TTCN3_COMPILER) $(COMPILER_FLAGS) $^
 
 clean distclean:
-	-$(RM) $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \
-	$(GENERATED_SOURCES) compile *.log *.gcda *.gcno  result.txt
+	$(RM) $(TARGET) $(GENERATED_HEADERS) $(GENERATED_SOURCES) $(OBJECTS) *.log Makefile.bak compile
 
 dep: $(GENERATED_SOURCES)
-	makedepend $(CPPFLAGS) $(USER_SOURCES) $(GENERATED_SOURCES)
-
-archive:
-	mkdir -p $(ARCHIVE_DIR)
-	tar -cvhf - $(TTCN3_MODULES) $(ASN1_MODULES) \
-	$(USER_HEADERS) $(USER_SOURCES) Makefile \
-	| gzip >$(ARCHIVE_DIR)/$(TARGET)-`date '+%y%m%d-%H%M'`.tgz
+	makedepend $(CPPFLAGS) $(GENERATED_SOURCES)
 
-#
-# Add your rules here if necessary...
-#
+run: $(TARGET) RAW_EncDec.cfg
+	./$^ 2> result.txt
+	cat result.txt
+	grep "Overall verdict: pass" result.txt

regression_test/EncodeDecode/RAW/RAW_bitstring/Makefile

@@ -58,6 +58,8 @@ dep: $(GENERATED_SOURCES)
 	makedepend $(CPPFLAGS) $(USER_SOURCES) $(GENERATED_SOURCES)
 
 run: $(TARGET) RAW_bitstring_test.cfg
-	./$^
+	./$^ 2> result.txt
+	cat result.txt
+	grep "Overall verdict: pass" result.txt
 
 # DO NOT DELETE