diff --git a/regression_test/RAW/Bug546231/.gitignore b/regression_test/RAW/Bug546231/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..fed16cf98577711d4081e12966fc4de18a9cc4d6 --- /dev/null +++ b/regression_test/RAW/Bug546231/.gitignore @@ -0,0 +1,7 @@ +Bug546231 +Bug546231.exe +Bug546231*.hh +Bug546231*.cc +*.d +compile +Bug546231*.log diff --git a/regression_test/RAW/Bug546231/Bug546231.ttcn b/regression_test/RAW/Bug546231/Bug546231.ttcn new file mode 100644 index 0000000000000000000000000000000000000000..40e03391dfb6bf193cb651349d1c99471e13b09b --- /dev/null +++ b/regression_test/RAW/Bug546231/Bug546231.ttcn @@ -0,0 +1,60 @@ +/****************************************************************************** + * 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: + * Baranyi, Botond – initial implementation + * Szalai, Gabor + * + ******************************************************************************/ + +module Bug546231 { + +external function dec_R2(in octetstring stream) return R2 +with { extension "prototype(convert)" extension "decode(RAW)" } + +type record R2 { + integer lengthfield, + record of integer listfield, + integer last_field +} with { + variant (lengthfield) "LENGTHTO(listfield)" + variant (lengthfield) "UNIT(elements)" +} + +type component CT {}; + +testcase tc1() runs on CT { + var R2 res := dec_R2('0000'O); + var R2 exp := { lengthfield := 0, listfield := { }, last_field := 0 }; + if (res == exp) { + setverdict(pass); + } + else { + setverdict(fail, "Got: ", res, ", expected: ", exp); + } +} + +testcase tc2() runs on CT { + var R2 res := dec_R2('010102'O); + var R2 exp := { lengthfield := 1, listfield := { 1 }, last_field := 2 }; + if (res == exp) { + setverdict(pass); + } + else { + setverdict(fail, "Got: ", res, ", expected: ", exp); + } +} + +control { + execute(tc1()); + execute(tc2()); +} + +} with { + encode "RAW" +} + diff --git a/regression_test/RAW/Bug546231/Makefile b/regression_test/RAW/Bug546231/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..c525e1307284173a3b4814eaaf6d366f143ad5bb --- /dev/null +++ b/regression_test/RAW/Bug546231/Makefile @@ -0,0 +1,147 @@ +############################################################################## +# 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: +# Botond, Baranyi +# +############################################################################## +TOPDIR := ../.. +include ../../Makefile.regression + +# WARNING! This Makefile can be used with GNU make only. +# Other versions of make may report syntax errors in it. + +# +# Do NOT touch this line... +# +.PHONY: all archive check clean dep objects + +.SUFFIXES: .d + +# +# Set these variables... +# + +# Flags for dependency generation +CXXDEPFLAGS = -MM + +ifeq ($(PLATFORM), WIN32) +# Silence linker warnings. +# Overridden by Makefile.cfg +endif + +# Flags for the TTCN-3 and ASN.1 compiler: +COMPILER_FLAGS += + +# Execution mode: (either ttcn3 or ttcn3-parallel) +TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX) + + +# +# You may change these variables. Add your files if necessary... +# + +# TTCN-3 modules of this project: +TTCN3_MODULES = Bug546231.ttcn + +# ASN.1 modules of this project: +ASN1_MODULES = + +# C++ source & header files generated from the TTCN-3 & ASN.1 modules of +# this project: +GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc) $(ASN1_MODULES:.asn=.cc) +GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh) +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 +# C/C++ Source & header files of Test Ports, external functions and +# other modules: +USER_SOURCES = +USER_HEADERS = $(USER_SOURCES:.cc=.hh) + +# Object files of this project that are needed for the executable test suite: +OBJECTS = $(GENERATED_OBJECTS) $(USER_OBJECTS) + +GENERATED_OBJECTS = $(GENERATED_SOURCES:.cc=.o) + +USER_OBJECTS = $(USER_SOURCES:.cc=.o) + +DEPFILES = $(USER_OBJECTS:.o=.d) $(GENERATED_OBJECTS:.o=.d) + + +# The name of the executable test suite: +TARGET = Bug546231$(EXESUFFIX) + + +# Rules for building the executable... +# + +all: $(TARGET) + +objects: $(OBJECTS) ; + +$(TARGET): $(OBJECTS) + if $(CXX) $(LDFLAGS) -o $@ $^ \ + -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \ + -L$(OPENSSL_DIR)/lib -lcrypto \ + -L$(XMLDIR)/lib $($(PLATFORM)_LIBS); \ + then : ; else $(TTCN3_DIR)/bin/titanver $(OBJECTS); exit 1; fi + +.cc.o .c.o: + $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $< + +.cc.d .c.d: + @echo Creating dependency file for '$<'; set -e; \ + $(CXX) $(CXXDEPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $< \ + | sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \ + [ -s $@ ] || rm -f $@ + +$(GENERATED_SOURCES) $(GENERATED_HEADERS): compile + @if [ ! -f $@ ]; then $(RM) compile; $(MAKE) compile; fi + +compile: $(TTCN3_MODULES) $(ASN1_MODULES) + $(TTCN3_COMPILER) $(COMPILER_FLAGS) $^ - $? + touch $@ + + +clean: + -$(RM) $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \ + $(GENERATED_SOURCES) compile $(DEPFILES) \ + tags *.log + +distclean: clean + -$(RM) $(DEPFILES) + + +dep: $(GENERATED_SOURCES) $(USER_SOURCES) ; + +ifeq ($(findstring n,$(MAKEFLAGS)),) +ifeq ($(filter clean distclean check compile archive diag,$(MAKECMDGOALS)),) +-include $(DEPFILES) +endif +endif + + + +diag: + $(TTCN3_COMPILER) -v 2>&1 + $(TTCN3_DIR)/bin/mctr_cli -v 2>&1 + $(CXX) -v 2>&1 + @echo TTCN3_DIR=$(TTCN3_DIR) + @echo OPENSSL_DIR=$(OPENSSL_DIR) + @echo XMLDIR=$(XMLDIR) + @echo PLATFORM=$(PLATFORM) + +# +# Add your rules here if necessary... +# + +run: $(TARGET) ./config.cfg + ./$^ diff --git a/regression_test/RAW/Bug546231/config.cfg b/regression_test/RAW/Bug546231/config.cfg new file mode 100644 index 0000000000000000000000000000000000000000..ea2a4db27956c0717fa0d5c4c8ceb20359e15f91 --- /dev/null +++ b/regression_test/RAW/Bug546231/config.cfg @@ -0,0 +1,20 @@ +############################################################################### +# 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: +# Botond, Baranyi +# +############################################################################### +[LOGGING] +LogFile := "Bug546231.log" +FileMask := LOG_ALL +ConsoleMask := TTCN_ERROR | TTCN_TESTCASE | TTCN_STATISTICS +LogSourceInfo := Yes +[EXECUTE] +Bug546231.control + +[TESTPORT_PARAMETERS] diff --git a/regression_test/RAW/Makefile b/regression_test/RAW/Makefile index 9db9d5da0a942312e0120cb0d721729bebd812c0..1e7747ced4fd792faa820e55d8459272a5fca0fd 100644 --- a/regression_test/RAW/Makefile +++ b/regression_test/RAW/Makefile @@ -19,7 +19,7 @@ TOPDIR := .. include $(TOPDIR)/Makefile.regression RDIRS = Examples HN25015 HQ26535 HQ49956 HS16977 ustr Annex_E_variants Bug521125 \ - Lengthto_Offset Bug522656 RAW_integer RAW_bitstring ForceOmit + Lengthto_Offset Bug522656 RAW_integer RAW_bitstring ForceOmit Bug546231 all dep clean run distclean: for dir in $(RDIRS); do (cd $$dir && $(MAKE) $@) || exit; done