diff options
| author | John Högberg <[email protected]> | 2017-07-27 09:10:16 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-07-27 09:10:16 +0200 |
| commit | 2f49a6bdc5bc9207162bff837b3f642cdd089722 (patch) | |
| tree | bc069deded7bf5130543a3be2dd66ad89abf7772 /lib/asn1/test/asn1_SUITE_data | |
| parent | 0b4e79dc173d562d05d93867d5cc9f1711ad0582 (diff) | |
| parent | 6ede2da826335960037299d9f3b0e66d072ea5a0 (diff) | |
| download | otp-2f49a6bdc5bc9207162bff837b3f642cdd089722.tar.gz otp-2f49a6bdc5bc9207162bff837b3f642cdd089722.tar.bz2 otp-2f49a6bdc5bc9207162bff837b3f642cdd089722.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
Fix doc for the 'quiet' option; it defaults to false
asn1: Fix missing quotes of external encoding call
Add a dedicated close function for TCP ports to prevent issues like ERL-430/448
Close TCP ports properly on send timeout
erts: Add missing release note
Diffstat (limited to 'lib/asn1/test/asn1_SUITE_data')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 | 3 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 b/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 index 32b8f75dde..dee3cd5048 100644 --- a/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 +++ b/lib/asn1/test/asn1_SUITE_data/ImportsFrom.asn1 @@ -1,8 +1,9 @@ ImportsFrom DEFINITIONS AUTOMATIC TAGS ::= BEGIN -IMPORTS Int FROM ImportsFrom2; +IMPORTS Int, Quoted-Seq FROM ImportsFrom2; i Int ::= 42 +My-Seq ::= Quoted-Seq END diff --git a/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 b/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 index b0c29d24ae..a8e619e215 100644 --- a/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 +++ b/lib/asn1/test/asn1_SUITE_data/ImportsFrom2.asn1 @@ -2,6 +2,11 @@ ImportsFrom2 DEFINITIONS AUTOMATIC TAGS ::= BEGIN IMPORTS Int FROM ImportsFrom3; +Quoted-Seq ::= SEQUENCE { + x INTEGER(0..17), + y INTEGER(0..666) +} + LocalDef ::= OCTET STRING END |