From 4351bd1e669b12e864efd57d0135604e42dfe20b Mon Sep 17 00:00:00 2001
From: balaskoa <Jeno.Balasko@ericsson.com>
Date: Mon, 2 Nov 2020 12:56:03 +0100
Subject: [PATCH] Naming synchronized with titan.EclipsePlug-ins
Signed-off-by: balaskoa <Jeno.Balasko@ericsson.com>
Change-Id: I2286cd558019cab80c2484196785dfefc6478046
---
regression_test/map_param/PT.cc | 2 +-
regression_test/map_param/PT.hh | 4 +-
.../{common.ttcn => map_param_common.ttcn} | 2 +-
.../map_param/parallel_mode/.gitignore | 12 ++++
.../map_param/parallel_mode/Makefile | 65 +++++++++++++++++++
...test.ttcn => map_param_parallel_test.ttcn} | 4 +-
.../map_param/parallel_mode/parallel.cfg | 6 +-
.../map_param/single_mode/.gitignore | 10 +--
.../map_param/single_mode/Makefile | 4 +-
...e_test.ttcn => map_param_single_test.ttcn} | 4 +-
.../map_param/single_mode/single.cfg | 8 +--
11 files changed, 99 insertions(+), 22 deletions(-)
rename regression_test/map_param/{common.ttcn => map_param_common.ttcn} (99%)
create mode 100644 regression_test/map_param/parallel_mode/.gitignore
create mode 100644 regression_test/map_param/parallel_mode/Makefile
rename regression_test/map_param/parallel_mode/{parallel_test.ttcn => map_param_parallel_test.ttcn} (92%)
rename regression_test/map_param/single_mode/{single_test.ttcn => map_param_single_test.ttcn} (92%)
diff --git a/regression_test/map_param/PT.cc b/regression_test/map_param/PT.cc
index ad57eb798..a38ec42c8 100644
--- a/regression_test/map_param/PT.cc
+++ b/regression_test/map_param/PT.cc
@@ -9,7 +9,7 @@
#include "PT.hh"
-namespace common {
+namespace map_param_common {
PT::PT(const char *par_port_name)
: PT_BASE(par_port_name)
diff --git a/regression_test/map_param/PT.hh b/regression_test/map_param/PT.hh
index 2405717cf..bbaa559c8 100644
--- a/regression_test/map_param/PT.hh
+++ b/regression_test/map_param/PT.hh
@@ -10,9 +10,9 @@
#ifndef PT_HH
#define PT_HH
-#include "common.hh"
+#include "map_param_common.hh"
-namespace common {
+namespace map_param_common {
class PT : public PT_BASE {
public:
diff --git a/regression_test/map_param/common.ttcn b/regression_test/map_param/map_param_common.ttcn
similarity index 99%
rename from regression_test/map_param/common.ttcn
rename to regression_test/map_param/map_param_common.ttcn
index 816bd76fc..fcd58871e 100644
--- a/regression_test/map_param/common.ttcn
+++ b/regression_test/map_param/map_param_common.ttcn
@@ -9,7 +9,7 @@
* Baranyi, Botond
*
******************************************************************************/
-module common {
+module map_param_common {
type record of integer IntList;
diff --git a/regression_test/map_param/parallel_mode/.gitignore b/regression_test/map_param/parallel_mode/.gitignore
new file mode 100644
index 000000000..39d54517a
--- /dev/null
+++ b/regression_test/map_param/parallel_mode/.gitignore
@@ -0,0 +1,12 @@
+map_param_parallel
+map_param_parallel.exe
+map_param_common.cc
+map_param_common.hh
+map_param_parallel_test.cc
+map_param_parallel_test.hh
+*.o
+*.d
+PT.cc
+PT.hh
+map_param_common.ttcn
+map_param_parallel*.log
diff --git a/regression_test/map_param/parallel_mode/Makefile b/regression_test/map_param/parallel_mode/Makefile
new file mode 100644
index 000000000..ddd375281
--- /dev/null
+++ b/regression_test/map_param/parallel_mode/Makefile
@@ -0,0 +1,65 @@
+##############################################################################
+# Copyright (c) 2000-2020 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:
+# Baranyi, Botond
+#
+##############################################################################
+TOPDIR := ../..
+include $(TOPDIR)/Makefile.regression
+
+.PHONY: all clean dep run
+
+TTCN3_LIB = ttcn3$(RT2_SUFFIX)-parallel$(DYNAMIC_SUFFIX)
+
+COMMON_TTCN3_MODULES = map_param_common.ttcn
+TTCN3_MODULES = $(COMMON_TTCN3_MODULES) map_param_parallel_test.ttcn
+
+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
+
+PORT_SOURCES = PT.cc
+PORT_HEADERS = $(PORT_SOURCES:.cc=.hh)
+
+
+OBJECTS = $(GENERATED_SOURCES:.cc=.o) $(PORT_SOURCES:.cc=.o)
+
+TARGET = map_param_parallel$(EXESUFFIX)
+
+all: $(TARGET)
+
+$(COMMON_TTCN3_MODULES) $(PORT_SOURCES) $(PORT_HEADERS):
+ ln -s ../$@
+
+$(TARGET): $(OBJECTS)
+ $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) -L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS)
+
+.cc.o:
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
+
+$(GENERATED_SOURCES) $(GENERATED_HEADERS): $(TTCN3_MODULES) $(PORT_HEADERS)
+ $(TTCN3_COMPILER) $(TTCN3_MODULES)
+
+clean distclean:
+ -rm -f $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \
+ $(GENERATED_SOURCES) *.log Makefile.bak
+
+dep: $(GENERATED_SOURCES)
+ makedepend $(CPPFLAGS) $(GENERATED_SOURCES)
+
+run: $(TARGET)
+ $(TTCN3_DIR)/bin/ttcn3_start $(TARGET) parallel.cfg
+
+
diff --git a/regression_test/map_param/parallel_mode/parallel_test.ttcn b/regression_test/map_param/parallel_mode/map_param_parallel_test.ttcn
similarity index 92%
rename from regression_test/map_param/parallel_mode/parallel_test.ttcn
rename to regression_test/map_param/parallel_mode/map_param_parallel_test.ttcn
index 49534f04b..c740715e9 100644
--- a/regression_test/map_param/parallel_mode/parallel_test.ttcn
+++ b/regression_test/map_param/parallel_mode/map_param_parallel_test.ttcn
@@ -11,9 +11,9 @@
******************************************************************************/
// this module contains tests for 'map'/'unmap' parameters in parallel mode
-module parallel_test {
+module map_param_parallel_test {
-import from common all;
+import from map_param_common all;
testcase tc_parallel_mtc() runs on CT {
f_test_params(mtc);
diff --git a/regression_test/map_param/parallel_mode/parallel.cfg b/regression_test/map_param/parallel_mode/parallel.cfg
index b19060ab1..bc7d2a689 100644
--- a/regression_test/map_param/parallel_mode/parallel.cfg
+++ b/regression_test/map_param/parallel_mode/parallel.cfg
@@ -13,9 +13,9 @@
[LOGGING]
Logfile := "map_param_parallel_%r.log"
FileMask := LOG_ALL
-ConsoleMask := TTCN_WARNING | TTCN_ERROR | TTCN_TESTCASE | TTCN_STATISTICS
+ConsoleMask := WARNING | ERROR | TESTCASE | STATISTICS
[EXECUTE]
-parallel_test.tc_parallel_mtc
-parallel_test.tc_parallel_ptc
+map_param_parallel_test.tc_parallel_mtc
+map_param_parallel_test.tc_parallel_ptc
diff --git a/regression_test/map_param/single_mode/.gitignore b/regression_test/map_param/single_mode/.gitignore
index cbe76a586..3ce575cc3 100644
--- a/regression_test/map_param/single_mode/.gitignore
+++ b/regression_test/map_param/single_mode/.gitignore
@@ -1,12 +1,12 @@
map_param_single
map_param_single.exe
-common*.cc
-common*.hh
-single_test*.cc
-single_test*.hh
+map_param_common*.cc
+map_param_common*.hh
+map_param_single_test.cc
+map_param_single_test.hh
*.o
*.d
PT.cc
PT.hh
-common.ttcn
+map_param_common.ttcn
map_param_single.log
diff --git a/regression_test/map_param/single_mode/Makefile b/regression_test/map_param/single_mode/Makefile
index 020064db4..6fa6f589c 100644
--- a/regression_test/map_param/single_mode/Makefile
+++ b/regression_test/map_param/single_mode/Makefile
@@ -16,8 +16,8 @@ include $(TOPDIR)/Makefile.regression
TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX)
-COMMON_TTCN3_MODULES = common.ttcn
-TTCN3_MODULES = $(COMMON_TTCN3_MODULES) single_test.ttcn
+COMMON_TTCN3_MODULES = map_param_common.ttcn
+TTCN3_MODULES = $(COMMON_TTCN3_MODULES) map_param_single_test.ttcn
GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc)
GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh)
diff --git a/regression_test/map_param/single_mode/single_test.ttcn b/regression_test/map_param/single_mode/map_param_single_test.ttcn
similarity index 92%
rename from regression_test/map_param/single_mode/single_test.ttcn
rename to regression_test/map_param/single_mode/map_param_single_test.ttcn
index 5e0be7e1f..ade47cbb9 100644
--- a/regression_test/map_param/single_mode/single_test.ttcn
+++ b/regression_test/map_param/single_mode/map_param_single_test.ttcn
@@ -11,9 +11,9 @@
******************************************************************************/
// this module contains tests for 'map'/'unmap' parameters in single mode
-module single_test {
+module map_param_single_test {
-import from common all;
+import from map_param_common all;
testcase tc_single() runs on CT {
f_test_params(mtc);
diff --git a/regression_test/map_param/single_mode/single.cfg b/regression_test/map_param/single_mode/single.cfg
index 34ad6523f..a5301d41d 100644
--- a/regression_test/map_param/single_mode/single.cfg
+++ b/regression_test/map_param/single_mode/single.cfg
@@ -13,9 +13,9 @@
[LOGGING]
Logfile := "map_param_single.log"
FileMask := LOG_ALL
-ConsoleMask := TTCN_WARNING | TTCN_ERROR | TTCN_TESTCASE | TTCN_STATISTICS
+ConsoleMask := WARNING | ERROR | TESTCASE | STATISTICS
[EXECUTE]
-single_test.tc_single
-single_test.tc_single_retval
-single_test.tc_single_mtc
+map_param_single_test.tc_single
+map_param_single_test.tc_single_retval
+map_param_single_test.tc_single_mtc
--
GitLab