aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/test/testMergeCompile.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-11-14 10:15:08 +0100
committerBjörn Gustavsson <[email protected]>2012-11-23 11:43:02 +0100
commit6ef8cbdaaaa1c30a7dc4620635726f62084dbd22 (patch)
treee9534d443f11f2521cc1de312f2e00ff4e471d97 /lib/asn1/test/testMergeCompile.erl
parent4a80c771f6a4e04fd4e7f7990e9d9a118ab2d689 (diff)
downloadotp-6ef8cbdaaaa1c30a7dc4620635726f62084dbd22.tar.gz
otp-6ef8cbdaaaa1c30a7dc4620635726f62084dbd22.tar.bz2
otp-6ef8cbdaaaa1c30a7dc4620635726f62084dbd22.zip
Remove obsolete back-ends and simplify the options
It is time to clean up the mess of back-ends. Remove all the obsolete back-ends and simplify the options used to select them. New Option Old Equivalent ---------- -------------- ber ber_bin,optimize,nif per per,optimize,nif uper uper_bin The old options will still be recognized and translated to the new options, but will also print a warning. That implies that deprecated features that only are implemented in the old 'ber' back-end will no longer work (e.g. the {Typename,Value} notation). Also make the return type for the generated encode/2 function consistent. It used to be a binary for per and uper, and an iolist for ber. Always make it a binary.
Diffstat (limited to 'lib/asn1/test/testMergeCompile.erl')
-rw-r--r--lib/asn1/test/testMergeCompile.erl12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/asn1/test/testMergeCompile.erl b/lib/asn1/test/testMergeCompile.erl
index 31aa3518f6..d63df28c31 100644
--- a/lib/asn1/test/testMergeCompile.erl
+++ b/lib/asn1/test/testMergeCompile.erl
@@ -43,17 +43,11 @@ main(Erule) ->
?line EncVal =
case Erule of
per ->
- [1,100];
- per_bin ->
<<1,100>>;
- uper_bin ->
+ uper ->
<<1,100>>;
ber ->
- [2,1,1];
- ber_bin ->
- <<2,1,1>>;
- ber_bin_v2 ->
- <<2,1,1>>
+ [2,1,1]
end,
?line PEVal2 = [{dummy,1,ignore,EncVal},{dummy,2,reject,EncVal}],
?line Val2 =
@@ -76,7 +70,7 @@ main(Erule) ->
mvrasn(Erule) ->
case Erule of
- Ber when Ber == ber;Ber == ber_bin ->
+ ber ->
?line ok = test(isd),
?line ok = test(isd2),
?line ok = test(dsd),