Merge changes Ia6e72268,Iad00a772

* changes:
  I forgot this file from my last commit
  OER tests moved under EncodeDecode/OER

regression_test/EncodeDecode/Makefile

@@ -15,7 +15,7 @@ include $(TOPDIR)/Makefile.regression
 unexport ABS_SRC
 unexport SRCDIR
 
-DIRS := BER OER_EncDec JSON RAW Text_EncDec XER_EncDec
+DIRS := BER OER JSON RAW Text_EncDec XER_EncDec
 
 # List of fake targets:
 .PHONY: all dep clean run $(DIRS) $(addsuffix /, $(DIRS)) profile

regression_test/EncodeDecode/OER/Makefile

+##############################################################################
+# 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
+#   Baranyi, Botond
+#   Hanko, Matyas
+#   Kovacs, Ferenc
+#   Raduly, Csaba
+#   Szabo, Bence Janos
+#   Szabo, Janos Zoltan – initial implementation
+#
+##############################################################################
+TOPDIR := ../../
+include $(TOPDIR)/Makefile.regression
+
+RDIRS = OER_BasicTest OER_EncDec
+
+all dep clean run distclean:
+	for dir in $(RDIRS); do (cd $$dir && $(MAKE) $@) || exit; done
+

regression_test/OER/Makefile → regression_test/EncodeDecode/OER/OER_BasicTest/Makefile

@@ -9,7 +9,7 @@
 #   Szabo, Bence Janos
 #
 ##############################################################################
-TOPDIR := ..
+TOPDIR := ../../../
 include $(TOPDIR)/Makefile.regression
 
 .SUFFIXES: .ttcn .asn .hh

regression_test/EncodeDecode/OER_EncDec/Makefile → regression_test/EncodeDecode/OER/OER_EncDec/Makefile

@@ -37,7 +37,7 @@
 # Set these variables...
 #
 
-TOPDIR := ../..
+TOPDIR := ../../..
 include $(TOPDIR)/Makefile.regression
 
 # The path of your TTCN-3 Test Executor installation:

regression_test/Makefile

@@ -48,7 +48,7 @@ XML ipv6 implicitOmit testcase_defparam transparent HQ16404 cfgFile \
 all_from lazyEval tryCatch text2ttcn ttcn2json profiler templateOmit \
 customEncoding makefilegen uidChars checkstate hostid templateIstemplatekind \
 selectUnion templateExclusiveRange any_from templatePatternRef indexWithRecofArray \
-connectMapOperTest fuzzy portTranslation ischosen OER functionSubref done \
+connectMapOperTest fuzzy portTranslation ischosen functionSubref done \
 nondeterministicDefaultParam predefFunction2 realtime portTranslationCentralStorage \
 locale oop