From 5be76ef23179caf6a7b78ae4740998b87c93a35b Mon Sep 17 00:00:00 2001 From: balaskoa <Jeno.Balasko@ericsson.com> Date: Thu, 12 Mar 2020 10:46:42 +0100 Subject: [PATCH] Makefile modification to JUnitLogger Signed-off-by: balaskoa <Jeno.Balasko@ericsson.com> Change-Id: I457d5f0073067777de562540d8bf23001e4974e8 --- .../EncodeDecode/RAW/RAW_integer/Makefile | 4 +- .../EncodeDecode/Text_EncDec/Makefile | 144 +++--------------- .../EncodeDecode/XER_EncDec/Makefile | 142 +++-------------- regression_test/intOper/Makefile | 4 +- 4 files changed, 53 insertions(+), 241 deletions(-) diff --git a/regression_test/EncodeDecode/RAW/RAW_integer/Makefile b/regression_test/EncodeDecode/RAW/RAW_integer/Makefile index 0a712dc02..b99024d38 100644 --- a/regression_test/EncodeDecode/RAW/RAW_integer/Makefile +++ b/regression_test/EncodeDecode/RAW/RAW_integer/Makefile @@ -58,6 +58,8 @@ dep: $(GENERATED_SOURCES) makedepend $(CPPFLAGS) $(USER_SOURCES) $(GENERATED_SOURCES) run: $(TARGET) RAW_integer_test.cfg - ./$^ + ./$^ 2> result.txt + cat result.txt + grep "Overall verdict: pass" result.txt # DO NOT DELETE diff --git a/regression_test/EncodeDecode/Text_EncDec/Makefile b/regression_test/EncodeDecode/Text_EncDec/Makefile index f86f58f9a..2e01b1ad6 100644 --- a/regression_test/EncodeDecode/Text_EncDec/Makefile +++ b/regression_test/EncodeDecode/Text_EncDec/Makefile @@ -13,153 +13,57 @@ # Szabados, Kristof # ############################################################################## -# This Makefile was generated by the Makefile Generator -# of the TTCN-3 Test Executor version 1.8.pl5 -# for ekrisza (ekrisza@EVF4CE46994947) on Mon Jan 24 08:27:55 2011 - -# 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 Text_EncDec.cfg -# -# Set these variables... -# - 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, SOLARIS8, LINUX, FREEBSD or WIN32) -ifndef PLATFORM -PLATFORM = SOLARIS -endif - -# Your C++ compiler: -#CXX = g++ - -# 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 - -# 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 +.PHONY: all clean dep run -# The path of your OpenSSL installation: -# If you do not have your own one, leave it unchanged. -OPENSSL_DIR = $(TTCN3_DIR) +TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX) -# 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... -# - -# TTCN-3 modules of this project: TTCN3_MODULES = Text_EncDec_1.ttcn Text_EncDec_2.ttcn Text_EncDec_3.ttcn Text_EncDec_4.ttcn -# ASN.1 modules of this project: -ASN1_MODULES = - -# C++ source & header files generated by TTCN-3 & ASN.1 compilers: -GENERATED_SOURCES = Text_EncDec_1.cc Text_EncDec_2.cc Text_EncDec_3.cc Text_EncDec_4.cc -GENERATED_HEADERS = Text_EncDec_1.hh Text_EncDec_2.hh Text_EncDec_3.hh Text_EncDec_4.hh +GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) +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 -# Source & header files of Test Ports and your other modules: USER_SOURCES = -USER_HEADERS = - -# Object files of this project that are needed for the executable test suite: -OBJECTS = $(GENERATED_OBJECTS) -GENERATED_OBJECTS = Text_EncDec_1.o Text_EncDec_2.o Text_EncDec_3.o Text_EncDec_4.o +# All object files needed for the executable test suite: +OBJECTS = $(GENERATED_SOURCES:.cc=.o) $(USER_SOURCES:.cc=.o) # The name of the executable test suite: -TARGET = Text_EncDec.exe - -ifeq ($(COVERAGE), yes) -CPPFLAGS += -fprofile-arcs -ftest-coverage -g -CXXFLAGS += -fprofile-arcs -ftest-coverage -g -LDFLAGS += -fprofile-arcs -ftest-coverage -g -lgcov -endif +TARGET = Text_EncDec$(EXESUFFIX) -# -# Do not modify these unless you know what you are doing... -# -SOLARIS_LIBS = -lxnet -L$(XMLDIR)/lib -lxml2 -lresolv -lcurses -SOLARIS8_LIBS = -lxnet -L$(XMLDIR)/lib -lxml2 -lresolv -lnsl -lsocket -lcurses -LINUX_LIBS = -L$(XMLDIR)/lib -lxml2 -lpthread -lrt -lncurses -FREEBSD_LIBS = -L$(XMLDIR)/lib -lxml2 -lncurses -WIN32_LIBS = -L$(XMLDIR)/lib -lxml2 -lncurses - -# -# Rules for building the executable... -# -all: $(TARGET) ; +all: $(TARGET) $(TARGET): $(OBJECTS) $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \ -L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS) -.cc.o .c.o: - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< - $(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) - $? + $(TTCN3_COMPILER) $(COMPILER_FLAGS) $^ touch $@ -run: $(TARGET) Text_EncDec.cfg - ./$^ 2> result.txt - cat result.txt - grep "Overall verdict: pass" result.txt - clean distclean: - -$(RM) $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \ - $(GENERATED_SOURCES) compile *.log *.gcda *.gcno result.txt + $(RM) $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \ + $(GENERATED_SOURCES) compile *.log 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 +run: $(TARGET) Text_EncDec.cfg + ./$^ 2> result.txt + cat result.txt + grep "Overall verdict: pass" result.txt -# -# Add your rules here if necessary... -# +# DO NOT DELETE diff --git a/regression_test/EncodeDecode/XER_EncDec/Makefile b/regression_test/EncodeDecode/XER_EncDec/Makefile index 214494be2..cc586148b 100644 --- a/regression_test/EncodeDecode/XER_EncDec/Makefile +++ b/regression_test/EncodeDecode/XER_EncDec/Makefile @@ -12,153 +12,57 @@ # Szabados, Kristof # ############################################################################## -# This Makefile was generated by the compiler -# of the TTCN-3 Test Executor version 1.5.pl1 -# for Botond Baranyi (ebotbar) on Tue Apr 29 13:50:16 2014 - -# 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 XER_EncDec.cfg -# -# Set these variables... -# - 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++ - -# 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 - -# 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 +.PHONY: all clean dep run -# The path of your OpenSSL installation: -# If you do not have your own one, leave it unchanged. -OPENSSL_DIR = $(TTCN3_DIR) +TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX) -# 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 = XER_EncDec_1.ttcn XER_EncDec_10.ttcn XER_EncDec_11.ttcn XER_EncDec_12.ttcn XER_EncDec_13.ttcn XER_EncDec_14.ttcn XER_EncDec_15.ttcn XER_EncDec_16.ttcn XER_EncDec_17.ttcn XER_EncDec_18.ttcn XER_EncDec_19.ttcn XER_EncDec_2.ttcn XER_EncDec_20.ttcn XER_EncDec_21.ttcn XER_EncDec_22.ttcn XER_EncDec_23.ttcn XER_EncDec_24.ttcn XER_EncDec_25.ttcn XER_EncDec_26.ttcn XER_EncDec_27.ttcn XER_EncDec_28.ttcn XER_EncDec_29.ttcn XER_EncDec_3.ttcn XER_EncDec_30.ttcn XER_EncDec_4.ttcn XER_EncDec_5.ttcn XER_EncDec_6.ttcn XER_EncDec_7.ttcn XER_EncDec_8.ttcn XER_EncDec_9.ttcn -# The ASN.1 modules needed for this project: -ASN1_MODULES = - -# C++ source & header files generated by TTCN-3 & ASN.1 compilers: -GENERATED_SOURCES = XER_EncDec_1.cc XER_EncDec_10.cc XER_EncDec_11.cc XER_EncDec_12.cc XER_EncDec_13.cc XER_EncDec_14.cc XER_EncDec_15.cc XER_EncDec_16.cc XER_EncDec_17.cc XER_EncDec_18.cc XER_EncDec_19.cc XER_EncDec_2.cc XER_EncDec_20.cc XER_EncDec_21.cc XER_EncDec_22.cc XER_EncDec_23.cc XER_EncDec_24.cc XER_EncDec_25.cc XER_EncDec_26.cc XER_EncDec_27.cc XER_EncDec_28.cc XER_EncDec_29.cc XER_EncDec_3.cc XER_EncDec_30.cc XER_EncDec_4.cc XER_EncDec_5.cc XER_EncDec_6.cc XER_EncDec_7.cc XER_EncDec_8.cc XER_EncDec_9.cc -GENERATED_HEADERS = XER_EncDec_1.hh XER_EncDec_10.hh XER_EncDec_11.hh XER_EncDec_12.hh XER_EncDec_13.hh XER_EncDec_14.hh XER_EncDec_15.hh XER_EncDec_16.hh XER_EncDec_17.hh XER_EncDec_18.hh XER_EncDec_19.hh XER_EncDec_2.hh XER_EncDec_20.hh XER_EncDec_21.hh XER_EncDec_22.hh XER_EncDec_23.hh XER_EncDec_24.hh XER_EncDec_25.hh XER_EncDec_26.hh XER_EncDec_27.hh XER_EncDec_28.hh XER_EncDec_29.hh XER_EncDec_3.hh XER_EncDec_30.hh XER_EncDec_4.hh XER_EncDec_5.hh XER_EncDec_6.hh XER_EncDec_7.hh XER_EncDec_8.hh XER_EncDec_9.hh +GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) +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 -# Source & header files of Test Ports and your other modules: USER_SOURCES = -USER_HEADERS = # All object files needed for the executable test suite: -OBJECTS = $(GENERATED_OBJECTS) - -GENERATED_OBJECTS = XER_EncDec_1.o XER_EncDec_10.o XER_EncDec_11.o XER_EncDec_12.o XER_EncDec_13.o XER_EncDec_14.o XER_EncDec_15.o XER_EncDec_16.o XER_EncDec_17.o XER_EncDec_18.o XER_EncDec_19.o XER_EncDec_2.o XER_EncDec_20.o XER_EncDec_21.o XER_EncDec_22.o XER_EncDec_23.o XER_EncDec_24.o XER_EncDec_25.o XER_EncDec_26.o XER_EncDec_27.o XER_EncDec_28.o XER_EncDec_29.o XER_EncDec_3.o XER_EncDec_30.o XER_EncDec_4.o XER_EncDec_5.o XER_EncDec_6.o XER_EncDec_7.o XER_EncDec_8.o XER_EncDec_9.o +OBJECTS = $(GENERATED_SOURCES:.cc=.o) $(USER_SOURCES:.cc=.o) # The name of the executable test suite: -TARGET = XER_EncDec.exe - -ifeq ($(COVERAGE), yes) -CPPFLAGS += -fprofile-arcs -ftest-coverage -g -CXXFLAGS += -fprofile-arcs -ftest-coverage -g -LDFLAGS += -fprofile-arcs -ftest-coverage -g -lgcov -endif +TARGET = XER_EncDec$(EXESUFFIX) -# -# 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 - -# -# Rules for building the executable... -# -all: $(TARGET) ; +all: $(TARGET) $(TARGET): $(OBJECTS) $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \ -L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS) -.cc.o .c.o: - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< - $(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) - $? + $(TTCN3_COMPILER) $(COMPILER_FLAGS) $^ touch $@ -run: $(TARGET) XER_EncDec.cfg - ./$^ 2> result.txt - cat result.txt - grep "Overall verdict: pass" result.txt - clean distclean: - -$(RM) $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \ - $(GENERATED_SOURCES) compile *.log *.gcda *.gcno result.txt + $(RM) $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \ + $(GENERATED_SOURCES) compile *.log 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 +run: $(TARGET) XER_EncDec.cfg + ./$^ 2> result.txt + cat result.txt + grep "Overall verdict: pass" result.txt -# -# Add your rules here if necessary... -# +# DO NOT DELETE diff --git a/regression_test/intOper/Makefile b/regression_test/intOper/Makefile index 67cbf2fc9..9c9139b64 100644 --- a/regression_test/intOper/Makefile +++ b/regression_test/intOper/Makefile @@ -57,7 +57,9 @@ dep: $(GENERATED_SOURCES) makedepend $(CPPFLAGS) $(GENERATED_SOURCES) run: $(TARGET) config.cfg - ./$^ + ./$^ 2> result.txt + cat result.txt + grep "Overall verdict: pass" result.txt PCOType.o: PCOType.cc TintOper.hh -- GitLab