aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/test/testMergeCompile.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-01-10 11:03:04 +0100
committerBjörn Gustavsson <[email protected]>2013-01-10 11:03:04 +0100
commitd07defaadc038455d3122bc7fdf2523efd2a9841 (patch)
tree48e39757174531eaea6361178ca330c592bca9c8 /lib/asn1/test/testMergeCompile.erl
parent4cd517c8168b2bdf7b38544e91afc14b535b3989 (diff)
parenta12301def60aa2c20f25eaad1299089de3375063 (diff)
downloadotp-d07defaadc038455d3122bc7fdf2523efd2a9841.tar.gz
otp-d07defaadc038455d3122bc7fdf2523efd2a9841.tar.bz2
otp-d07defaadc038455d3122bc7fdf2523efd2a9841.zip
Merge branch 'bjorn/asn1/minor-fixes'
* bjorn/asn1/minor-fixes: (21 commits) Always inline decoding of open types Eliminate code duplication per: Slightly optimize encoding of fixed OCTET STRINGs per: Fix encoding of OCTET STRINGs with fixed length of 256 or more Remove support for the {Typename,Value} notation in encoding asn1ct_parser2: Let synonyms share parsing code Add a test case for constraint equivalence Make .abs file consultable Fix a bug in skipping of extensions asn1rt_uper_bin: Correct incorrect skipping of extensions asn1 doc: Remove a reference to a section that has been removed Simplify testConstraints by introducing helper functions Simplify testCompactBitString by introducing roundtrip functions Simplify testEnumExt by introducing a roundtrip/2 function Simplify testChoExternal by introducing a roundtrip/2 function Simplify testChoRecursive by introducing a roundtrip/2 function Simplify testSeqExtension.erl by introducing a roundtrip/2 function Simplify testChoExtension by introducing a roundtrip/2 function Simplify testSetOptional by introducing a roundtrip/2 function testSetOptional: Correct test case for decoding of corrupt data ...
Diffstat (limited to 'lib/asn1/test/testMergeCompile.erl')
-rw-r--r--lib/asn1/test/testMergeCompile.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asn1/test/testMergeCompile.erl b/lib/asn1/test/testMergeCompile.erl
index d63df28c31..8ef7ba3458 100644
--- a/lib/asn1/test/testMergeCompile.erl
+++ b/lib/asn1/test/testMergeCompile.erl
@@ -37,7 +37,7 @@ main(Erule) ->
%% test of RANAP.set.asn1
?line _PIEVal = [{'ProtocolIE-Field',4,ignore,{'Cause',{radioNetwork,{'CauseRadioNetwork','rab-pre-empted'}}}}],
- ?line PIEVal2 = [{'ProtocolIE-Field',4,ignore,{'Cause',{radioNetwork,'rab-pre-empted'}}}],
+ PIEVal2 = [{'ProtocolIE-Field',4,ignore,{radioNetwork,'rab-pre-empted'}}],
?line _PEVal = [{'ProtocolExtensionField',[0]}],
%% ?line EncVal = asn1rt_per_v1:encode_integer([],100),
?line EncVal =