diff options
| author | Björn Gustavsson <[email protected]> | 2013-06-10 09:30:13 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-06-10 09:30:13 +0200 |
| commit | 3785a3b673a3530c94b9ee3dc053dcb07b71e62f (patch) | |
| tree | 080e5971e99cf4a6709b71600d211f1bbb8ac7cd /lib/asn1/test | |
| parent | a9375574104b8a0b2c0590efaa1c9cf2e9d01cb1 (diff) | |
| parent | 69f02872020636d3efbbecf4bd3de7196040f6a9 (diff) | |
| download | otp-3785a3b673a3530c94b9ee3dc053dcb07b71e62f.tar.gz otp-3785a3b673a3530c94b9ee3dc053dcb07b71e62f.tar.bz2 otp-3785a3b673a3530c94b9ee3dc053dcb07b71e62f.zip | |
Merge branch 'bjorn/asn1/fix-extension-addition-groups/OTP-11154' into maint
* bjorn/asn1/fix-extension-addition-groups/OTP-11154:
PER, UPER: Fix record name mismatch between HRL file and decoding code
Diffstat (limited to 'lib/asn1/test')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn | 19 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl | 3 |
2 files changed, 22 insertions, 0 deletions
diff --git a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn index b07dcd8baa..0e905d8839 100644 --- a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn +++ b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn @@ -118,4 +118,23 @@ AC-BarringConfig ::= SEQUENCE { ac-BarringForSpecialAC BIT STRING (SIZE(5)) } +InlinedSeq ::= SEQUENCE { + ..., + [[ + s SEQUENCE { + a INTEGER, + b BOOLEAN + } + ]] +} + +-- 'ExtAddGroup1' is used internally to represent fake sequences for +-- extension addition groups. Make sure that a real sequence with that +-- name at the top-level doesn't cause a problem. + +ExtAddGroup1 ::= SEQUENCE { + x INTEGER, + y INTEGER +} + END diff --git a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl index 00e4c707dd..8e21e6ca84 100644 --- a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl +++ b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl @@ -34,6 +34,9 @@ run(Erule) -> run3(), run3(Erule), + roundtrip('InlinedSeq', #'InlinedSeq'{s=#'InlinedSeq_s'{a=42,b=true}}), + roundtrip('ExtAddGroup1', #'ExtAddGroup1'{x=42,y=1023}), + ok. %% From X.691 (07/2002) A.4. |