Merge branch 'bjorn/asn1/further-cleanup/OTP-10588'

* bjorn/asn1/further-cleanup/OTP-10588: (28 commits)
  Don't export encode_disp/2 and decode_disp/2 in generated modules
  Remove vestiges of support for the {TypeName,Value} notation
  Simplify the functions for decoding lengths
  per,uper: Optimize decoding of the remaining data types
  per,uper: Optimize decoding of the remaining string types
  Share all code for dec_gen_prim/3 between per/uper back-ends
  per,uper: Optimize decoding of the string data types
  testPrimStrings: Test some constraints
  By default, encode BIT STRING to bitstrings
  Teach encode functions to accept a bitstring term for a BIT STRING
  Fix EXTERNAL 1990/1994 conversion information loss
  uper: Look up some SizeConstraints at compile-time
  Enumeration decoding: Don't emit a default clause if it cannot match
  Slightly optimize per encoding of large INTEGERs with constraints
  BER run-time: Refactor decoding of string data types
  Refactor decoding of BIT STRINGs
  Optimize encoding of ENUMERATED in per and uper
  Remove the unused run-time modules
  eldap: Remove calls to undocumented asn1rt* functions
  BER: Correct bug in 'undec_rest'
  ...

18 files changed, 243 insertions, 579 deletions

diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 1794d6bb71..1fa495d8f1 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -102,7 +102,6 @@ MODULES= \
 	test_driver_load \
 	testSelectionTypes \
 	test_undecoded_rest \
-	test_inline \
 	testTcapsystem \
 	testNBAPsystem \
 	test_compile_options \
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 325293f35d..0d09929f6d 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -66,12 +66,12 @@ groups() ->
      {appup_test, [], [{asn1_appup_test, all}]},
 
      {parallel, parallel([]),
-      [{group, ber},
+      [cover,
+       {group, ber},
        % Uses 'P-Record', 'Constraints', 'MEDIA-GATEWAY-CONTROL'...
        {group, [], [parse,
                     test_driver_load,
                     test_undecoded_rest,
-                    test_inline,
                     specialized_decodes,
                     special_decode_performance,
                     testMegaco,
@@ -296,6 +296,28 @@ case_dir([C|Config], Opt) ->
 %% Test cases
 %%------------------------------------------------------------------------------
 
+%% Cover run-time functions that are only called by the ASN.1 compiler
+%% (if any).
+cover(_) ->
+    Wc = filename:join([code:lib_dir(asn1),"ebin","asn1ct_eval_*.beam"]),
+    Beams = filelib:wildcard(Wc),
+    true = Beams =/= [],
+    [begin
+	 M0 = filename:basename(Beam),
+	 M1 = filename:rootname(M0),
+	 M = list_to_atom(M1),
+	 "asn1ct_eval_" ++ Group0 = M1,
+	 Group = list_to_atom(Group0),
+	 io:format("%%\n"
+		   "%% ~s\n"
+		   "%%\n", [M]),
+	 asn1ct_func:start_link(),
+	 [asn1ct_func:need({Group,F,A}) ||
+	     {F,A} <- M:module_info(exports), F =/= module_info],
+	 asn1ct_func:generate(group_leader())
+     end || Beam <- Beams],
+    ok.
+
 testPrim(Config) -> test(Config, fun testPrim/3).
 testPrim(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["Prim", "Real"], Config, [Rule|Opts]),
@@ -323,11 +345,16 @@ testPrimStrings(Config) -> test(Config, fun testPrimStrings/3).
 testPrimStrings(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config, [Rule|Opts]),
     testPrimStrings_cases(Rule),
+    asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
+			      [legacy_bit_string,Rule|Opts]),
+    testPrimStrings:bit_string(Rule),
+    asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
+			      [compact_bit_string,Rule|Opts]),
+    testPrimStrings:bit_string(Rule),
     ?only_ber(testPrimStrings:more_strings(Rule)).
 
 testPrimStrings_cases(Rule) ->
     testPrimStrings:bit_string(Rule),
-    testPrimStrings:bit_string_unnamed(Rule),
     testPrimStrings:octet_string(Rule),
     testPrimStrings:numeric_string(Rule),
     testPrimStrings:other_strings(Rule),
@@ -978,14 +1005,8 @@ testSSLspecs(Config, Rule, Opts) ->
     ok = testSSLspecs:compile(Config,
                               [Rule, compact_bit_string, der|Opts]),
     testSSLspecs:run(Rule),
-
-    case code:which(asn1ct) of
-       cover_compiled ->
-           ok;
-       _ ->
-           ok = testSSLspecs:compile_inline(Config, Rule),
-           ok = testSSLspecs:run_inline(Rule)
-    end.
+    ok = testSSLspecs:compile_combined(Config, Rule),
+    ok = testSSLspecs:run_combined(Rule).
 
 testNortel(Config) -> test(Config, fun testNortel/3).
 testNortel(Config, Rule, Opts) ->
@@ -996,23 +1017,7 @@ test_undecoded_rest(Config, Rule, Opts) ->
     asn1_test_lib:compile("P-Record", Config, [Rule|Opts]),
     ok = test_undecoded_rest:test([], Config),
     asn1_test_lib:compile("P-Record", Config, [Rule,undec_rest|Opts]),
-    case Rule of
-        ber -> ok;
-        _ -> test_undecoded_rest:test(undec_rest, Config)
-    end.
-
-test_inline(Config) ->
-    test(Config, fun test_inline/3, [ber]).
-test_inline(Config, Rule, Opts) ->
-    case code:which(asn1ct) of
-        cover_compiled ->
-            {skip, "Not runnable when cover compiled"};
-        _  ->
-            test_inline:compile(Config, Opts),
-            test_inline:main(Config, Rule),
-            test_inline:inline1(Config, Rule, Opts),
-            test_inline:performance2()
-    end.
+    test_undecoded_rest:test(undec_rest, Config).
 
 testTcapsystem(Config) ->
     test(Config, fun testTcapsystem/3, [ber]).
@@ -1025,17 +1030,12 @@ testNBAPsystem(Config, Rule, Opts) ->
     testNBAPsystem:test(Rule, Config).
 
 test_compile_options(Config) ->
-    case code:which(asn1ct) of
-        cover_compiled ->
-            {skip, "Not runnable when cover compiled"};
-        _  ->
-            ok = test_compile_options:wrong_path(Config),
-            ok = test_compile_options:path(Config),
-            ok = test_compile_options:noobj(Config),
-            ok = test_compile_options:record_name_prefix(Config),
-            ok = test_compile_options:verbose(Config),
-            ok = test_compile_options:warnings_as_errors(Config)
-    end.
+    ok = test_compile_options:wrong_path(Config),
+    ok = test_compile_options:path(Config),
+    ok = test_compile_options:noobj(Config),
+    ok = test_compile_options:record_name_prefix(Config),
+    ok = test_compile_options:verbose(Config),
+    ok = test_compile_options:warnings_as_errors(Config).
 
 testDoubleEllipses(Config) -> test(Config, fun testDoubleEllipses/3).
 testDoubleEllipses(Config, Rule, Opts) ->
diff --git a/lib/asn1/test/asn1_SUITE_data/Prim.asn1 b/lib/asn1/test/asn1_SUITE_data/Prim.asn1
index 1a905988f5..17a5d3490a 100644
--- a/lib/asn1/test/asn1_SUITE_data/Prim.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/Prim.asn1
@@ -29,4 +29,10 @@ BEGIN
 
   Null ::= NULL
 
+  -- Test that REAL numbers can co-exist with other data types.
+  App-X-Real ::= REAL (WITH COMPONENTS {
+                        mantissa (-16777215..16777215),
+			base (2),
+			exponent (-125..128) } )
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
index 9b6b34a776..cfaf4cf034 100644
--- a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
@@ -87,14 +87,17 @@ BS1024 ::= BIT STRING (SIZE (1024))
   NsExpCon ::= [71] EXPLICIT NumericString
 
   Ps ::= PrintableString
+  Ps11 ::= PrintableString (FROM ("0123456789*"))
 
   Ts ::= TeletexString
 
   Vxs ::= VideotexString
 
   Vis ::= VisibleString
+  Vis8 ::= VisibleString (FROM ("01234567"))
 
   IA5 ::= IA5String
+  IA5Visible ::= IA5String (FROM (" ".."~"))
 
   Grs ::= GraphicString
   
diff --git a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
index 8148381d92..1aec3e1fab 100644
--- a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
+++ b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
@@ -140,7 +140,7 @@ run3() ->
     Barring = #'AC-BarringConfig'{
                  'ac-BarringFactor' = p00,
                  'ac-BarringTime' = s4,
-                 'ac-BarringForSpecialAC' = [0,0,0,0,0]},
+                 'ac-BarringForSpecialAC' = <<0:5>>},
     roundtrip(SI),
     roundtrip(SI#'SystemInformationBlockType2'{
 		'ssac-BarringForMMTEL-Voice-r9'=Barring}),
diff --git a/lib/asn1/test/asn1_app_test.erl b/lib/asn1/test/asn1_app_test.erl
index 9dbe1b50e0..1225e36778 100644
--- a/lib/asn1/test/asn1_app_test.erl
+++ b/lib/asn1/test/asn1_app_test.erl
@@ -139,7 +139,8 @@ check_asn1ct_modules(Extra) ->
 		  asn1ct_gen_ber,asn1ct_constructed_ber_bin_v2,
 		  asn1ct_gen_ber_bin_v2,asn1ct_value,
 		  asn1ct_tok,asn1ct_parser2,asn1ct_table,
-		  asn1ct_imm],
+		  asn1ct_imm,asn1ct_func,asn1ct_rtt,
+		  asn1ct_eval_ext,asn1ct_eval_per,asn1ct_eval_uper],
     case Extra -- ASN1CTMods of
 	[] ->
 	    ok;
diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl
index fda635d0eb..1e40fd7b9e 100644
--- a/lib/asn1/test/asn1_test_lib.erl
+++ b/lib/asn1/test/asn1_test_lib.erl
@@ -61,15 +61,12 @@ compile_erlang(Mod, Config, Options) ->
                            [{i, CaseDir}, {outdir, CaseDir}|Options]).
 
 should_load(File, Options) ->
-    should_load(File, lists:member(abs, Options),
-                proplists:lookup(inline, Options)).
-
-should_load(_File, true, _Inline) ->
-    false;
-should_load(_File, _Abs, {inline, Module}) when Module /= true ->
-    {module, Module};
-should_load(File, _Abs, _Inline) ->
-    {module, list_to_atom(strip_extension(filename:basename(File)))}.
+    case lists:member(abs, Options) of
+	true ->
+	    false;
+	false ->
+	    {module,list_to_atom(strip_extension(filename:basename(File)))}
+    end.
 
 strip_extension(File) ->
     strip_extension(File, filename:extension(File)).
diff --git a/lib/asn1/test/ber_decode_error.erl b/lib/asn1/test/ber_decode_error.erl
index ff6e386a88..af0105bf26 100644
--- a/lib/asn1/test/ber_decode_error.erl
+++ b/lib/asn1/test/ber_decode_error.erl
@@ -21,31 +21,34 @@
 
 -export([run/1]).
 
--include_lib("test_server/include/test_server.hrl").
-
 run([]) ->
-    ?line {ok,B}  = asn1_wrapper:encode('Constructed','S3',{'S3',17}),
-    ?line [T,L|V] = lists:flatten(B),
-    ?line Bytes = [T,L+3|V] ++ [2,1,3],
-    ?line case asn1_wrapper:decode('Constructed','S3',Bytes) of
-	      {error,{asn1,{unexpected,_}}} -> ok
-	  end,
-    %% Unexpected bytes must be accepted if there is an extensionmark
-    ?line {ok,{'S3ext',17}} = asn1_wrapper:decode('Constructed','S3ext',Bytes),
-    ok; 
-run([driver]) ->
-    %% test of OTP-4797, bad indata to driver does not cause an EXIT
-    ?line {error,_Reason} = asn1rt:decode('Constructed','S3',[3,5]),
-    ok;
-run([nif]) ->
-    %% test of OTP-4797, bad indata to driver does not cause an EXIT
-    ?line {error,_Reason} = asn1rt:decode('Constructed','S3',[3,5]),
-    ok.
-
+    {ok,B}  = asn1_wrapper:encode('Constructed','S3',{'S3',17}),
+    [T,L|V] = lists:flatten(B),
+    Bytes = [T,L+3|V] ++ [2,1,3],
+    case asn1_wrapper:decode('Constructed','S3',Bytes) of
+	{error,{asn1,{unexpected,_}}} -> ok
+    end,
 
+    %% Unexpected bytes must be accepted if there is an extensionmark
+    {ok,{'S3ext',17}} = asn1_wrapper:decode('Constructed','S3ext',Bytes),
 
+    %% Truncated tag.
+    {error,{asn1,{invalid_tag,_}}} =
+	(catch 'Constructed':decode('I', <<31,255,255>>)),
 
+    %% Overlong tag.
+    {error,{asn1,{invalid_tag,_}}} =
+	(catch 'Constructed':decode('I', <<31,255,255,255,127>>)),
 
+    %% Invalid length.
+    {error,{asn1,{invalid_length,_}}} =
+	(catch 'Constructed':decode('I', <<8,255>>)),
 
+    %% Other errors.
+    {error,{asn1,{invalid_value,_}}} =
+	(catch 'Constructed':decode('I', <<>>)),
 
+    {error,{asn1,{invalid_value,_}}} =
+	(catch 'Constructed':decode('I', <<8,7>>)),
 
+    ok.
diff --git a/lib/asn1/test/testContextSwitchingTypes.erl b/lib/asn1/test/testContextSwitchingTypes.erl
index 4f67942922..f06cc7c117 100644
--- a/lib/asn1/test/testContextSwitchingTypes.erl
+++ b/lib/asn1/test/testContextSwitchingTypes.erl
@@ -52,22 +52,36 @@ test(Config) ->
 
 
 check_EXTERNAL({'EXTERNAL',Identif,DVD,DV})->
-    ?line ok=check_EXTERNAL_Idef(Identif),
-    ?line ok = check_EXTERNAL_DVD(DVD),
-    ?line ok = check_EXTERNAL_DV(DV).
-check_EXTERNAL_Idef({Alt,_}) when Alt=='context-negotiation';
-				  Alt=='presentation-context-id';
-				  Alt==syntax ->
-    ok;
-check_EXTERNAL_Idef(I) ->
-    {error,"failed on identification alternative",I}.
-check_EXTERNAL_DVD(DVD) when is_list(DVD) ->
-    ok;
-check_EXTERNAL_DVD(asn1_NOVALUE) ->
-    ok;
-check_EXTERNAL_DVD(DVD) ->
-    {error,"failed on data-value-descriptor alternative",DVD}.
-check_EXTERNAL_DV(DV) when is_list(DV);is_binary(DV) ->
-    ok;
-check_EXTERNAL_DV(DV) ->
-    {error,"failed on data-value alternative",DV}.
+    %% EXTERNAL in the 1994 format.
+    case Identif of
+	{'context-negotiation',_} ->
+	    ok;
+	{'presentation-context-id',Id} ->
+	    true = is_integer(Id);
+	{syntax,ObjId} ->
+	    check_object_identifier(ObjId)
+    end,
+    check_EXTERNAL_DVD(DVD),
+    check_EXTERNAL_DV(DV);
+check_EXTERNAL({'EXTERNAL',ObjId,IndirectRef,Descriptor,Enc})->
+    %% EXTERNAL in the 1990 format.
+    check_object_identifier(ObjId),
+    true = is_integer(IndirectRef),
+    true = is_binary(Descriptor) orelse is_list(Descriptor),
+    case Enc of
+	{arbitrary,_} -> ok;
+	{'single-ASN1-type',_} -> ok;
+	{'octet-aligned',_} -> ok
+    end.
+
+check_EXTERNAL_DVD(DVD) when is_list(DVD) -> ok;
+check_EXTERNAL_DVD(asn1_NOVALUE) -> ok.
+
+check_EXTERNAL_DV(DV) when is_list(DV); is_binary(DV) -> ok.
+
+check_object_identifier(Tuple) when is_tuple(Tuple) ->
+    %% An OBJECT IDENTIFIER is a tuple with integer elements.
+    case [E || E <- tuple_to_list(Tuple),
+	       not is_integer(E)] of
+	[] -> ok
+    end.
diff --git a/lib/asn1/test/testDoubleEllipses.erl b/lib/asn1/test/testDoubleEllipses.erl
index 9030a99ce2..72ff693667 100644
--- a/lib/asn1/test/testDoubleEllipses.erl
+++ b/lib/asn1/test/testDoubleEllipses.erl
@@ -51,7 +51,7 @@ main(_Rules) ->
 				      b = [1,0,1,0], e = true,
 				      c = false, f = 14, g = 16}),
     ?line {ok,#'SeqAltV2'{a = 10, d = 12, 
-			  b = [1,0,1,0], e = true,
+			  b = <<2#1010:4>>, e = true,
 			  h = asn1_NOVALUE, i = asn1_NOVALUE,
 			  c = false, f = 14, g = 16}} =
 	asn1_wrapper:decode('DoubleEllipses','SeqAltV2',Bytes3),
@@ -62,7 +62,7 @@ main(_Rules) ->
 				      h = "PS", i = 13,
 				      c = false, f = 14, g = 16}),
      ?line {ok,#'SeqAlt'{a = 10, d = 12, 
-			 b = [1,0,1,0], e = true,
+			 b = <<2#1010:4>>, e = true,
 			 c = false, f = 14, g = 16}} =
 	asn1_wrapper:decode('DoubleEllipses','SeqAlt',Bytes4),
     
@@ -83,7 +83,7 @@ main(_Rules) ->
 				      b = [1,0,1,0], e = true,
 				      c = false, f = 14, g = 16}),
     ?line {ok,#'SetAltV2'{a = 10, d = 12, 
-			  b = [1,0,1,0], e = true,
+			  b = <<2#1010:4>>, e = true,
 			  h = asn1_NOVALUE, i = asn1_NOVALUE,
 			  c = false, f = 14, g = 16}} =
 	asn1_wrapper:decode('DoubleEllipses','SetAltV2',Bytes7),
@@ -94,7 +94,7 @@ main(_Rules) ->
 				      h = "PS", i = 13,
 				      c = false, f = 14, g = 16}),
      ?line {ok,#'SetAlt'{a = 10, d = 12, 
-			 b = [1,0,1,0], e = true,
+			 b = <<2#1010:4>>, e = true,
 			 c = false, f = 14, g = 16}} =
 	asn1_wrapper:decode('DoubleEllipses','SetAlt',Bytes8),
     ok.
diff --git a/lib/asn1/test/testNBAPsystem.erl b/lib/asn1/test/testNBAPsystem.erl
index 4e8381e51e..3e7dfb0522 100644
--- a/lib/asn1/test/testNBAPsystem.erl
+++ b/lib/asn1/test/testNBAPsystem.erl
@@ -142,8 +142,7 @@ audit_req() ->
 	   protocolIEs = 
 	   [#'ProtocolIE-Field'{id=114,
 				criticality=ignore, 
-				value={'Start-Of-Audit-Sequence-Indicator',
-				       'start-of-audit-sequence' } 
+				value='start-of-audit-sequence'
 			       }
 	   ]  
 	  }.
diff --git a/lib/asn1/test/testParamBasic.erl b/lib/asn1/test/testParamBasic.erl
index b5780195b8..e5e2de804c 100644
--- a/lib/asn1/test/testParamBasic.erl
+++ b/lib/asn1/test/testParamBasic.erl
@@ -40,8 +40,8 @@ main(Rules) ->
     ?line {ok,Bytes12} = 
 	asn1_wrapper:encode('ParamBasic','T12',
 			    #'T12'{number = 11,
-				   string = [1,0,1,0,1]}),
-    ?line {ok,{'T12',11,[1,0,1,0,1]}} =
+				   string = <<2#10101:5>>}),
+    {ok,{'T12',11,<<2#10101:5>>}} =
 	asn1_wrapper:decode('ParamBasic','T12',Bytes12),
     
     ?line {ok,Bytes13} = 
@@ -54,8 +54,8 @@ main(Rules) ->
     ?line {ok,Bytes14} = 
 	asn1_wrapper:encode('ParamBasic','T22',
 			    #'T22'{number = 11,
-				   string = [1,0,1,0,1]}),
-    ?line {ok,{'T22',11,[1,0,1,0,1]}} =
+				   string = <<2#10101:5>>}),
+    {ok,{'T22',11,<<2#10101:5>>}} =
 	asn1_wrapper:decode('ParamBasic','T22',Bytes14),
 
     case Rules of
diff --git a/lib/asn1/test/testPrimStrings.erl b/lib/asn1/test/testPrimStrings.erl
index 263d9e5ed2..935e730ca1 100644
--- a/lib/asn1/test/testPrimStrings.erl
+++ b/lib/asn1/test/testPrimStrings.erl
@@ -20,7 +20,6 @@
 -module(testPrimStrings).
 
 -export([bit_string/1]).
--export([bit_string_unnamed/1]).
 -export([octet_string/1]).
 -export([numeric_string/1]).
 -export([other_strings/1]).
@@ -37,93 +36,35 @@ bit_string(Rules) ->
     %%==========================================================
     %% Bs1 ::= BIT STRING
     %%==========================================================
+
+    bs_roundtrip('Bs1', 0, <<>>),
+    bs_roundtrip('Bs1', 4, <<1:3>>),
+    bs_roundtrip('Bs1', 15, <<15:4>>),
+    bs_roundtrip('Bs1', 255, <<255:8>>),
+
+    bs_roundtrip('Bs1', 256, [0,0,0,0,0,0,0,0,1]),
+    bs_roundtrip('Bs1', 257, [1,0,0,0,0,0,0,0,1]),
+    bs_roundtrip('Bs1', 444, [0,0,1,1,1,1,0,1,1]),
     
-    ?line {ok,Bytes1} = asn1_wrapper:encode('PrimStrings','Bs1',0),
-    ?line {ok,[]} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes1)),
-    
-    ?line {ok,Bytes2} = asn1_wrapper:encode('PrimStrings','Bs1',4),
-    ?line {ok,[0,0,1]} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes2)),
-    
-    ?line {ok,Bytes3} = asn1_wrapper:encode('PrimStrings','Bs1',15),
-    ?line {ok,[1,1,1,1]} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes3)),
-    
-    ?line {ok,Bytes4} = asn1_wrapper:encode('PrimStrings','Bs1',255),
-    ?line {ok,[1,1,1,1,1,1,1,1]} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes4)),
-    
-    ?line {ok,Bytes5} = asn1_wrapper:encode('PrimStrings','Bs1',256),
-    ?line {ok,[0,0,0,0,0,0,0,0,1]} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes5)),
-    
-    ?line {ok,Bytes6} = asn1_wrapper:encode('PrimStrings','Bs1',257),
-    ?line {ok,[1,0,0,0,0,0,0,0,1]} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes6)),
-    
-    ?line {ok,Bytes7} = asn1_wrapper:encode('PrimStrings','Bs1',444),
-    ?line {ok,[0,0,1,1,1,1,0,1,1]} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes7)),
-    
-    ?line {ok,Bytes8} = asn1_wrapper:encode('PrimStrings','Bs1',12345678901234567890),
-    ?line {ok,_} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes8)),
-    
-%% Removed due to beam cannot handle this big integers    
-%%    Bs1_1 = 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
-%%    ?line {ok,Bytes9} = asn1_wrapper:encode('PrimStrings','Bs1',Bs1_1),
-%%    ?line {ok,_} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes9)),
-    
-%%    Bs1_2 = 12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
-%%    ?line {ok,Bytes10} = asn1_wrapper:encode('PrimStrings','Bs1',Bs1_2),
-%%    ?line {ok,_} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes10)),
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('PrimStrings','Bs1',[1,1,1,1,1,1,1,1]),
-    ?line {ok,[1,1,1,1,1,1,1,1]} = asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes11)),
-    
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,Bytes12} = asn1_wrapper:encode('PrimStrings','Bs1',[0,1,0,0,1,0]),
-		  ?line {ok,[0,1,0,0,1,0]} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes12)),
-		  
-		  ?line {ok,Bytes13} = asn1_wrapper:encode('PrimStrings','Bs1',[1,0,0,0,0,0,0,0,0]),
-		  ?line {ok,[1,0,0,0,0,0,0,0,0]} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes13)),
-		  ok;
-	      per ->
-		  ?line {ok,Bytes12} = asn1_wrapper:encode('PrimStrings','Bs1',[0,1,0,0,1,0]),
-		  ?line {ok,[0,1,0,0,1,0]} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes12)),
-		  
-		  ?line {ok,Bytes13} = asn1_wrapper:encode('PrimStrings','Bs1',[1,0,0,0,0,0,0,0,0]),
-		  ?line {ok,[1,0,0,0,0,0,0,0,0]} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes13)),
-		  ok
-	  end,
-    
-    ?line {ok,Bytes14} = 
-	asn1_wrapper:encode('PrimStrings','Bs1',[0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]),
-    ?line {ok,[0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]} = 
-	asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes14)),
-    
-    
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line Bytes15 = [35,8,3,2,0,73,3,2,4,32],
-		  ?line {ok,[0,1,0,0,1,0,0,1,0,0,1,0]} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes15)),
-		  
-		  ?line Bytes16 = [35,9,3,2,0,234,3,3,7,156,0],
-		  ?line {ok,[1,1,1,0,1,0,1,0,1,0,0,1,1,1,0,0,0]} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes16)),
-		  
-		  ?line Bytes17 = [35,128,3,2,0,73,3,2,4,32,0,0],
-		  ?line {ok,[0,1,0,0,1,0,0,1,0,0,1,0]} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes17)),
-		  
-		  ?line Bytes18 = [35,128,3,2,0,234,3,3,7,156,0,0,0],
-		  ?line {ok,[1,1,1,0,1,0,1,0,1,0,0,1,1,1,0,0,0]} = 
-		      asn1_wrapper:decode('PrimStrings','Bs1',lists:flatten(Bytes18)),
-		  ok;
-	      
-	      per ->
-		  ok
-	  end,
+    {ok,Enc1} = 'PrimStrings':encode('Bs1', 12345678901234567890),
+    {ok,_} = 'PrimStrings':decode('Bs1', Enc1),
+
+    bs_roundtrip('Bs1', [1,1,1,1,1,1,1,1]),
+    bs_roundtrip('Bs1', [0,1,0,0,1,0]),
+    bs_roundtrip('Bs1', [1,0,0,0,0,0,0,0,0]),
+    bs_roundtrip('Bs1', [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]),
     
+    case asn1_wrapper:erule(Rules) of
+	ber ->
+	    bs_decode('Bs1', <<35,8,3,2,0,73,3,2,4,32>>,
+		      [0,1,0,0,1,0,0,1,0,0,1,0]),
+	    bs_decode('Bs1', <<35,9,3,2,0,234,3,3,7,156,0>>,
+		      [1,1,1,0,1,0,1,0,1,0,0,1,1,1,0,0,0]),
+	    bs_decode('Bs1', <<35,128,3,2,0,234,3,3,7,156,0,0,0>>,
+		      [1,1,1,0,1,0,1,0,1,0,0,1,1,1,0,0,0]);
+	per ->
+	    ok
+    end,
 
     
     %%==========================================================
@@ -156,77 +97,55 @@ bit_string(Rules) ->
     %% Bs3 ::= BIT STRING {su(0), mo(1), tu(2), we(3), th(4), fr(5), sa(6) } (SIZE (1..7))
     %%==========================================================
     
-    ?line {ok,Bytes31} = asn1_wrapper:encode('PrimStrings','Bs3',[mo,tu,fr]),
-    ?line {ok,[mo,tu,fr]} = asn1_wrapper:decode('PrimStrings','Bs3',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('PrimStrings','Bs3',[0,1,1,0,0,1,0]),
-    ?line {ok,[mo,tu,fr]} = asn1_wrapper:decode('PrimStrings','Bs3',lists:flatten(Bytes32)),
-    
+    roundtrip('Bs3', [mo,tu,fr]),
+    bs_roundtrip('Bs3', [0,1,1,0,0,1,0], [mo,tu,fr]),
     
     %%==========================================================
     %% Bs7 ::= BIT STRING (SIZE (24))
     %%==========================================================
 
-    ?line {ok,Bytes33} = asn1_wrapper:encode('PrimStrings','Bs7',53245),
-    ?line {ok,[1,0,1,1,1,1,1,1,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0]} =
-	asn1_wrapper:decode('PrimStrings','Bs7',Bytes33),
-
-    ?line {ok,Bytes34} = asn1_wrapper:encode('PrimStrings','Bs7',[1,0,1,0]),
-    ?line {ok,[1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]} =
-	asn1_wrapper:decode('PrimStrings','Bs7',Bytes34),
+    bs_roundtrip('Bs7', 53245,
+		 [1,0,1,1,1,1,1,1,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0]),
+    bs_roundtrip('Bs7', [1,0,1,0],
+		 [1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]),
     
     %%==========================================================
     %% BsPri ::= [PRIVATE 61] BIT STRING
     %%==========================================================
     
-    ?line {ok,Bytes41} = asn1_wrapper:encode('PrimStrings','BsPri',45),
-    ?line {ok,[1,0,1,1,0,1]} = asn1_wrapper:decode('PrimStrings','BsPri',lists:flatten(Bytes41)),
+    bs_roundtrip('BsPri', 45, [1,0,1,1,0,1]),
     
-    ?line {ok,Bytes42} = asn1_wrapper:encode('PrimStrings','BsPri',211),
-    ?line {ok,[1,1,0,0,1,0,1,1]} = asn1_wrapper:decode('PrimStrings','BsPri',lists:flatten(Bytes42)),
-    
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,[0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]} = 
-		      asn1_wrapper:decode('PrimStrings','BsPri',[223,61,4,5,75,226,96]),
-		  
-		  ?line {ok,[0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]} = 
-		      asn1_wrapper:decode('PrimStrings','BsPri',[255,61,128,3,4,5,75,226,96,0,0]),
-		  
-		  ?line {ok,[0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]} = 
-		      asn1_wrapper:decode('PrimStrings','BsPri',[255,61,9,3,2,0,75,3,3,5,226,96]),
-		  
-		  ?line {ok,[0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]} = 
-		      asn1_wrapper:decode('PrimStrings','BsPri',[255,61,128,3,2,0,75,3,3,5,226,96,0,0]),
-		  ok;
-	      
-	      per ->
-		  ok
-	  end,
+    bs_roundtrip('BsPri', 211, [1,1,0,0,1,0,1,1]),
     
+    case asn1_wrapper:erule(Rules) of
+	ber ->
+	    bs_decode('BsPri', <<223,61,4,5,75,226,96>>,
+		      [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]),
+	    bs_decode('BsPri', <<255,61,128,3,4,5,75,226,96,0,0>>,
+		      [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]),
+	    bs_decode('BsPri', <<255,61,9,3,2,0,75,3,3,5,226,96>>,
+		      [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]),
+	    bs_decode('BsPri', <<255,61,128,3,2,0,75,3,3,5,226,96,0,0>>,
+		      [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]);
+	per ->
+	    ok
+    end,
     
     
     %%==========================================================
     %% BsExpPri ::= [PRIVATE 61] EXPLICIT BIT STRING
     %%==========================================================
     
-    ?line {ok,Bytes51} = asn1_wrapper:encode('PrimStrings','BsExpPri',45),
-    ?line {ok,[1,0,1,1,0,1]} = 
-	asn1_wrapper:decode('PrimStrings','BsExpPri',lists:flatten(Bytes51)),
-    
-    ?line {ok,Bytes52} = asn1_wrapper:encode('PrimStrings','BsExpPri',211),
-    ?line {ok,[1,1,0,0,1,0,1,1]} = 
-	asn1_wrapper:decode('PrimStrings','BsExpPri',lists:flatten(Bytes52)),
+    bs_roundtrip('BsExpPri', 45, [1,0,1,1,0,1]),
+    bs_roundtrip('BsExpPri', 211, [1,1,0,0,1,0,1,1]),
     
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,[0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]} = 
-		      asn1_wrapper:decode('PrimStrings','BsExpPri',[255,61,6,3,4,5,75,226,96]),
-		  ok;
-	      
-	      per ->
-		  ok
-	  end,
+    case asn1_wrapper:erule(Rules) of
+	ber ->
+	    bs_decode('BsExpPri', <<255,61,6,3,4,5,75,226,96>>,
+		      [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]);
+	per ->
+	    ok
+    end,
     
     %%==========================================================
     %% TestS ::= BIT STRING {a(0),b(1)} (SIZE (3..8)), test case for OTP-4353
@@ -248,14 +167,10 @@ bit_string(Rules) ->
     %% BS5932 ::= BIT STRING (SIZE (5..MAX))
     %% test case for OTP-5932
     %%==========================================================
+    bs_roundtrip('BSMAX', [1,0,1,0,1]),
     case asn1_wrapper:erule(Rules) of
 	ber ->
-	    ?line {error,_} = asn1_wrapper:encode('PrimStrings','BSMAX',
-						  [1,0,1]),
-	    ?line {ok,Bytes55} = 
-		asn1_wrapper:encode('PrimStrings','BSMAX',[1,0,1,0,1]),
-	    ?line {ok,[1,0,1,0,1]} = 
-		asn1_wrapper:decode('PrimStrings','BSMAX',Bytes55);
+	    {error,_} = 'PrimStrings':encode('BSMAX', [1,0,1]);
 	_ ->
 	    ok
     end,
@@ -274,47 +189,13 @@ bit_string(Rules) ->
 	end,
     
     BSList255 = BSmaker(BSmaker,0,255,{1,0},[]),
+    bs_roundtrip('BS255', BSList255),
     BSList256 = BSmaker(BSmaker,0,256,{1,0},[]),
+    bs_roundtrip('BS256', BSList256),
     BSList1024 = BSmaker(BSmaker,0,1024,{1,0},[]),
-    ?line {ok,Bytes56} = 
-	asn1_wrapper:encode('PrimStrings','BS255',BSList255),
-    ?line {ok,BSList255} = 
-	asn1_wrapper:decode('PrimStrings','BS255',Bytes56),
-    ?line {ok,Bytes57} = 
-	asn1_wrapper:encode('PrimStrings','BS256',BSList256),
-    ?line {ok,BSList256} = 
-	asn1_wrapper:decode('PrimStrings','BS256',Bytes57),
-    ?line {ok,Bytes58} = 
-	asn1_wrapper:encode('PrimStrings','BS1024',BSList1024),
-    ?line {ok,BSList1024} = 
-	asn1_wrapper:decode('PrimStrings','BS1024',Bytes58).
-    
-	    
-
-bit_string_unnamed(Rules) ->
-    case asn1_wrapper:erule(Rules) of
-	ber ->
-	    ok;
-	per ->
-	    ?line {ok,Bytes1} = 
-		case catch asn1_wrapper:encode('PrimStrings','TransportLayerAddress',[0,1,1,0]) of
-		    Ret = {ok,_} -> Ret;
-		    Err ->
-			Config = file:consult(test_config),
-			?line OutDir = ?config(priv_dir,Config),
-			MyOut = "/home/bertil/daily_build",
-			file:copy(filename:join([OutDir,"PrimStrings.erl"]),
-				  filename:join([MyOut,"PrimStrings.erl"])),
-			file:copy(filename:join([OutDir,"PrimStrings.beam"]),
-				  filename:join([MyOut,"PrimStrings.beam"])),
-			file:copy(code:which(asn1rt_per_v1),
-				  filename:join([MyOut,"asn1rt_per_v1.beam"])),
-			file:copy(filename:join([code:lib_dir(asn1),src,"asn1rt_per_v1.erl"]),filename:join([MyOut,"asn1rt_per_v1.erl"])),
-			io:format("Err: ~p~n",[Err]),
-			Err
-		end,
-	    ?line {ok,[0,1,1,0]} = asn1_wrapper:decode('PrimStrings','TransportLayerAddress',lists:flatten(Bytes1))
-    end.
+    bs_roundtrip('BS1024', BSList1024),
+
+    bs_roundtrip('TransportLayerAddress', [0,1,1,0]).
 
 octet_string(Rules) ->
 
@@ -534,7 +415,7 @@ other_strings(_Rules) ->
 
     roundtrip('Ps', [47,23,99,75,47]),
     roundtrip('Ps', []),
-    
+    roundtrip('Ps11', "*0123456789*"),
 		       
     %%==========================================================
     %% Vis ::= VisibleString
@@ -542,7 +423,8 @@ other_strings(_Rules) ->
 
     roundtrip('Vis', [47,23,99,75,47]),
     roundtrip('Vis', []),
-
+    roundtrip('Vis8', "7654321001234567"),
+    roundtrip('Vis8', []),
 		       
     %%==========================================================
     %% IA5 ::= IA5String
@@ -553,6 +435,9 @@ other_strings(_Rules) ->
 
     IA5_1 = "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
     roundtrip('IA5', IA5_1),
+
+    roundtrip('IA5Visible', lists:seq($\s, $~)),
+
     ok.
 
 
@@ -828,3 +713,39 @@ roundtrip(Type, Value) ->
     {ok,Encoded} = 'PrimStrings':encode(Type, Value),
     {ok,Value} = 'PrimStrings':decode(Type, Encoded),
     ok.
+
+bs_roundtrip(Type, Value) ->
+    bs_roundtrip(Type, Value, Value).
+
+bs_roundtrip(Type, Value, Expected) ->
+    M = 'PrimStrings',
+    {ok,Encoded} = M:encode(Type, Value),
+    case M:decode(Type, Encoded) of
+	{ok,Expected} ->
+	    ok;
+	{ok,Other} ->
+	    Expected = convert(Other, Expected)
+    end.
+
+bs_decode(Type, Encoded, Expected) ->
+    M = 'PrimStrings',
+    case M:decode(Type, Encoded) of
+	{ok,Expected} ->
+	    ok;
+	{ok,Other} ->
+	    Expected = convert(Other, Expected)
+    end.
+
+convert(Val, E) when is_bitstring(Val) ->
+    convert_1(Val, E);
+convert({Unused,Bin}, E) ->
+    Sz = bit_size(Bin) - Unused,
+    <<Val:Sz/bitstring,_:Unused>> = Bin,
+    convert_1(Val, E);
+convert(List, E) when is_list(List) ->
+    Val = << <<B:1>> || B <- List >>,
+    convert_1(Val, E).
+
+convert_1(Val, E) when is_list(E) ->
+    [B || <<B:1>> <= Val];
+convert_1(Val, E) when is_bitstring(E) -> Val.
diff --git a/lib/asn1/test/testSSLspecs.erl b/lib/asn1/test/testSSLspecs.erl
index 45c5da50f0..08da92243e 100644
--- a/lib/asn1/test/testSSLspecs.erl
+++ b/lib/asn1/test/testSSLspecs.erl
@@ -20,7 +20,7 @@
 
 -module(testSSLspecs).
 
--export([compile/2,run/1,compile_inline/2,run_inline/1]).
+-export([compile/2,run/1,compile_combined/2,run_combined/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -42,15 +42,13 @@ compile(Config, Options) ->
     asn1_test_lib:compile_all(["PKIX1Explicit93", "PKIX1Implicit93"],
                               Config, NewOptions).
 
-compile_inline(Config, ber=Rule) ->
+compile_combined(Config, ber=Rule) ->
     DataDir = ?config(data_dir, Config),
     CaseDir = ?config(case_dir, Config),
     Options = [{i, CaseDir}, {i, DataDir}, Rule,
-               der, compact_bit_string, asn1config, inline],
-    ok = remove_db_file_inline(CaseDir),
-    asn1_test_lib:compile("OTP-PKIX.set.asn", Config, Options);
-compile_inline(_Config, _Rule) ->
-    ok.
+               der, compact_bit_string, asn1config],
+    ok = remove_db_files_combined(CaseDir),
+    asn1_test_lib:compile("OTP-PKIX.set.asn", Config, Options).
 
 remove_db_files(Dir) ->
     ?line ok = remove_db_file(Dir ++ "PKIX1Explicit93.asn1db"),
@@ -65,7 +63,7 @@ remove_db_file(File) ->
 	    Err
     end.
 
-remove_db_file_inline(Dir) ->
+remove_db_files_combined(Dir) ->
     ?line ok = remove_db_file(Dir ++ "OTP-PKIX.asn1db"),
     ?line ok = remove_db_file(Dir ++ "SSL-PKIX.asn1db"),
     ?line ok = remove_db_file(Dir ++ "PKIXAttributeCertificate.asn1db"),
@@ -74,14 +72,11 @@ remove_db_file_inline(Dir) ->
     ?line ok = remove_db_file(Dir ++ "PKIX1Implicit88.asn1db").
 
 run(ber) ->
-    run1(1);
-run(_) ->
-    ok.
+    run1(1).
 
 run1(6) ->
     ?line f1(6),
     ?line f2(6),
-%%    ?line transform3(ex(7)),
     ?line transform4(ex(7));
 run1(N) ->
     ?line f1(N),
@@ -146,12 +141,10 @@ ex(7) ->
      {1,2,840,113549,1,9,1},
      [[19,5,111,116,112,67,65]]}.
 
-run_inline(ber) ->
+run_combined(ber) ->
     Cert = cert(),
     ?line {ok,{'CertificatePKIX1Explicit88',{Type,UnDec},_,_}} = 'OTP-PKIX':decode_TBSCert_exclusive(Cert),
     ?line {ok,_} = 'OTP-PKIX':decode_part(Type,UnDec),
-    ok;
-run_inline(_) ->
     ok.
 
 cert() ->
diff --git a/lib/asn1/test/testSeqSetDefaultVal.erl b/lib/asn1/test/testSeqSetDefaultVal.erl
index ab484db5f2..6e680feafa 100644
--- a/lib/asn1/test/testSeqSetDefaultVal.erl
+++ b/lib/asn1/test/testSeqSetDefaultVal.erl
@@ -134,7 +134,7 @@ main(_Rules) ->
 				     c={5,<<64>>},
 				     d=0}),
 
-    ?line {ok,{'SeqBS',[1,0,1,0,1,1,0],2698,[second],[]}} =
+    {ok,{'SeqBS',[1,0,1,0,1,1,0],2698,[second],<<>>}} =
 	asn1_wrapper:decode('Default','SeqBS',[48,3,131,1,0]),
 
     ?line {ok,{'SeqBS',[1,0,1,0,1,1,0],2698,[second],[1,0,0,1]}} =
@@ -161,7 +161,7 @@ main(_Rules) ->
 				     c={5,<<64>>},
 				     d=0}),
 
-    ?line {ok,{'SetBS',[1,0,1,0,1,1,0],2698,[second],[]}} =
+    {ok,{'SetBS',[1,0,1,0,1,1,0],2698,[second],<<>>}} =
 	asn1_wrapper:decode('Default','SetBS',[49,3,131,1,0]),
 
     ?line {ok,{'SetBS',[1,0,1,0,1,1,0],2698,[second],[1,0,0,1]}} =
diff --git a/lib/asn1/test/testTypeValueNotation.erl b/lib/asn1/test/testTypeValueNotation.erl
index 59f7385f08..d21b054e8d 100644
--- a/lib/asn1/test/testTypeValueNotation.erl
+++ b/lib/asn1/test/testTypeValueNotation.erl
@@ -28,7 +28,7 @@ main(_Rule, _Option) ->
                     int = 12,
                     bool = true,
                     enum = a,
-                    bitstr = [1, 0, 1, 0],
+                    bitstr = <<2#1010:4>>,
                     null = 'NULL',
                     oid = {1, 2, 55},
                     vstr = "Hello World"},
diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl
index b973c5fbcc..179299c78d 100644
--- a/lib/asn1/test/test_compile_options.erl
+++ b/lib/asn1/test/test_compile_options.erl
@@ -51,14 +51,13 @@ path(Config) ->
     {ok,CWD} = file:get_cwd(),
     ?line file:set_cwd(filename:join([DataDir,subdir])),
 
-    %%?line ok=asn1ct:compile(filename:join([DataDir,"../MyMerge.set.asn"]),[{inline,mymerge},{outdir,OutDir}]),
-    ?line ok=asn1ct:compile("../MyMerge.set.asn",[{inline,mymerge},{outdir,OutDir}]),
+    ok = asn1ct:compile("../MyMerge.set.asn",[{outdir,OutDir}]),
 
     ?line ok=outfiles_check(OutDir),
     ?line outfiles_remove(OutDir),
 
     file:set_cwd(filename:join([DataDir,subdir,subsubdir])),
-    ?line ok = asn1ct:compile('../../MyMerge.set.asn',[{inline,mymerge},{i,'..'},{outdir,OutDir}]),
+    ok = asn1ct:compile('../../MyMerge.set.asn',[{i,'..'},{outdir,OutDir}]),
 
     ?line ok=outfiles_check(OutDir,outfiles2()),
     file:set_cwd(CWD),
@@ -182,11 +181,10 @@ outfiles_check(OutDir,[H|T]) ->
     outfiles_check(OutDir,T).
 
 outfiles1() ->
-    ["mymerge.erl","mymerge.beam","MyMerge.asn1db","MyMerge.beam",
+    ["MyMerge.asn1db","MyMerge.beam",
      "MyMerge.erl","MyMerge.hrl"].
 outfiles2() ->
-    ["MyMerge.beam","mymerge.erl","MyMerge.asn1db","MyMerge.erl",
-     "mymerge.beam"].
+    ["MyMerge.beam","MyMerge.asn1db","MyMerge.erl"].
 
 outfiles_remove(OutDir) ->
     lists:foreach(fun(F)-> file:delete(filename:join([OutDir,F])) end,
diff --git a/lib/asn1/test/test_inline.erl b/lib/asn1/test/test_inline.erl
deleted file mode 100644
index e03ad739f9..0000000000
--- a/lib/asn1/test/test_inline.erl
+++ /dev/null
@@ -1,270 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
--module(test_inline).
-
--export([compile/2,main/2,inline1/3,performance/1,performance2/0]).
--export([mvrasn_inlined_encdec/2,mvrasn_encdec/2,
-	 mi_encdec/2,m_encdec/2]).
-
--include_lib("test_server/include/test_server.hrl").
--define(times, 5000).
--define(times2, 50000).
-
-compile(Config, Options) ->
-    CaseDir = ?config(case_dir, Config),
-    asn1_test_lib:compile("Mvrasn.set.asn", Config, [{inline, mvrasn_inlined}|Options]),
-    asn1_test_lib:compile("Mod.set.asn", Config, [{inline, m}|Options]),
-    ok = remove_inlined_files(CaseDir, [filename:join([CaseDir, X])||X<-["m.erl", "m.beam"]]),
-    asn1_test_lib:compile("Mod.set.asn", Config, [inline|Options]),
-    ok = remove_inlined_files(CaseDir, []).
-
-inline1(Config, Rule, Opt) ->
-    CaseDir = ?config(case_dir, Config),
-
-    asn1_test_lib:compile("P-Record", Config, [{inline, 'inlined_P_Record'}|Opt]),
-    test_inline1(),
-
-    ok=remove_inlined_files2(CaseDir, ber),
-
-    case Rule of
-        ber ->
-            asn1_test_lib:compile("P-Record", Config,
-                                  [ber, inline, asn1config|Opt]),
-            test_inline2(Rule, 'P-Record'),
-            remove_inlined_files3(CaseDir, Rule),
-            asn1_test_lib:compile("p_record.set.asn", Config,
-                                  [ber, inline, asn1config|Opt]),
-            test_inline2(Rule, 'p_record'),
-            remove_inlined_files4(CaseDir, Rule);
-        _ ->
-            ok
-    end.
-
-main(Config, _Erule) ->
-    Val = val(Config),
-    ?line {ok,Bytes}=asn1_wrapper:encode(mvrasn_inlined,'InsertSubscriberDataArg',Val),
-    ?line {ok,_Val2}=asn1_wrapper:decode(mvrasn_inlined,'InsertSubscriberDataArg',Bytes).
-
-test_inline1() ->
-     PRecMsg = {'PersonnelRecord',{'Name',"Sven","S","Svensson"},
-	       "manager",123,"20000202",{'Name',"Inga","K","Svensson"},
-		asn1_DEFAULT},
-    ?line {ok,Bytes}=asn1_wrapper:encode('inlined_P_Record','PersonnelRecord',
-				   PRecMsg),
-    ?line {ok,_}=asn1_wrapper:decode('inlined_P_Record',
-				     'PersonnelRecord',Bytes).
-
-test_inline2(ber,Mod) ->
-    PRecMsg = {'PersonnelRecord',{'Name',"Sven","S","Svensson"},
-	       "manager",123,"20000202",{'Name',"Inga","K","Svensson"},
-	       asn1_DEFAULT},
-    ?line {ok,Bytes} = Mod:encode('PersonnelRecord',PRecMsg),
-    {ok,_} = Mod:sel_dec(Bytes);
-test_inline2(_,_) ->
-    ok.
-
-val(Config) ->
-    {ok,Val} = asn1ct:value('Mvrasn','InsertSubscriberDataArg',
-                            [{i, ?config(case_dir, Config)}]),
-    Val.
-
-performance(Config) ->
-    Val = val(Config),
-    %% warm up
-    timer:tc(?MODULE,mvrasn_inlined_encdec,[2,Val]),
-    %% performance test
-    ?line {Time1,ok}=timer:tc(?MODULE,mvrasn_inlined_encdec,[?times,Val]),
-    %% warm up
-    timer:tc(?MODULE,mvrasn_encdec,[2,Val]),
-    %% performance test
-    ?line {Time2,ok}=timer:tc(?MODULE,mvrasn_encdec,[?times,Val]),
-
-    ?line Comment = "inlined_code: "++
-	integer_to_list(round(Time1/?times))++
-	" micro,<br>original_code: "++
-	integer_to_list(round(Time2/?times))++
-% 	" micro,~ninlined_code[inline]: "++
-% 	integer_to_list(round(Time3/?times))++
-	" micro",
-    {comment,Comment}.
-
-
-mvrasn_inlined_encdec(0,_) ->
-    ok;
-mvrasn_inlined_encdec(N,V) ->
-    ?line {ok,B}=mvrasn_inlined:encode('InsertSubscriberDataArg',V),
-    ?line {ok,_R}=mvrasn_inlined:decode('InsertSubscriberDataArg',B),
-    mvrasn_inlined_encdec(N-1,V).
-
-mvrasn_encdec(0,_) ->
-    ok;
-mvrasn_encdec(N,V) ->
-    ?line {ok,B}='Mvrasn-11-6':encode('InsertSubscriberDataArg',V),
-    ?line {ok,_R}='Mvrasn-11-6':decode('InsertSubscriberDataArg',B),
-    mvrasn_encdec(N-1,V).
-
-%% mvrasn_inlined_i_encdec(0,_) ->
-%%     ok;
-%% mvrasn_inlined_i_encdec(N,V) ->
-%%     {ok,B}=mvrasn_inlined_i:encode('InsertSubscriberDataArg',V),
-%%     {ok,_R}=mvrasn_inlined_i:decode('InsertSubscriberDataArg',B),
-%%     mvrasn_inlined_i_encdec(N-1,V).
-
-performance2() ->
-    Val = mval(),
-    %% warm up
-    timer:tc(?MODULE,mi_encdec,[?times,Val]),
-    %% performance test
-    {Time1,_R1}=timer:tc(?MODULE,mi_encdec,[?times2,Val]),
-    %% warm up
-    timer:tc(?MODULE,m_encdec,[?times,Val]),
-    %% performance test
-    {Time2,_R2}=timer:tc(?MODULE,m_encdec,[?times2,Val]),
-    ?line Comment = "inlined_code: "++
-	integer_to_list(round(Time1/?times2))++
-	" micro,<br>original_code: "++
-	integer_to_list(round(Time2/?times2))++
-	" micro<br>"++
-	"The inlined code was "++
-	integer_to_list(round(((Time2-Time1)/Time2)*100))++
-	" % faster than the original code.",
-    {comment,Comment}.
-
-mi_encdec(0,_) ->
-    ok;
-mi_encdec(N,Val) ->
-    {ok,B}=m:encode('L',Val),
-    {ok,_R}=m:decode('L',B),
-%    io:format("a"),
-    mi_encdec(N-1,Val).
-
-m_encdec(0,_) ->
-    ok;
-m_encdec(N,Val) ->
-    {ok,B}='Mod':encode('L',Val),
-    {ok,_R}='Mod':decode('L',B),
-    m_encdec(N-1,Val).
-
-
--record('L', {country, region, name}).
--record('OtherName', {locationName, thingName}).
--record('FamilyName', {prefix, secondname}).
--record('Lang', {l}).
--record('Inhabitant', {name, country}).
--record('Country', {name, language}).
--record('PersonName', {name1, name2}).
--record('LocName', {region, name}).
--record('Reg', {name, inhabitants}).
-
-
-mval() ->
-    'L'().
-'L'() ->
-    #'L'{
-     country='Co'(),
-     region='Reg'(),
-     name='Name'(othername)}.
-'Co'() ->
-    'Country'().
-'Country'()->
-    #'Country'{name='Name'(othername),
-	       language='Lang'()}.
-'Lang'()->
-    #'Lang'{l="englsh"}.
-'Reg'() ->
-    #'Reg'{
-       name='Name'(othername),
-       inhabitants='Inhabitants'()}.
-'Inhabitants'()->
-    lists:duplicate(5,'Inhabitant'()).
-'Inhabitant'()->
-    #'Inhabitant'{name='Name'(person),
-		 country='Country'()}.
-'Name'(person) ->
-    {person,'PersonName'()};
-'Name'(othername) ->
-    {othername,'OtherName'()}.
-'PersonName'()->
-    #'PersonName'{name1='FirstName'(firstname),
-		  name2='FamilyName'()}.
-'OtherName'()->
-    #'OtherName'{locationName='LocName'(),
-		 thingName='ThingName'()}.
-'FirstName'(firstname)->
-    {firstname,"Henry"};
-'FirstName'(nickname) ->
-    {nickname,"nick"}.
-'FamilyName'() ->
-    #'FamilyName'{prefix=none,
-		  secondname="Lloyd"}.
-'ThingName'()->
-    "Enkoping".
-'LocName'()->
-    #'LocName'{
-	   region=svealand,
-	   name="Enkoping"}.
-
-remove_inlined_files(Dir,Files) ->
-    ModList=[filename:join([Dir,X])||X<-["Mod"]],
-    FileList=Files++ mods2files(ModList,".asn1db")++
-	mods2files(ModList,".beam")++
-	mods2files(ModList,".erl")++mods2files(ModList,".hrl"),
-    lists:foreach(fun(X) ->
-			  io:format("X: ~p~n",[X]),
-			  ?line ok=file:delete(X)
-		  end,FileList),
-    ok.
-mods2files(ModList,Extension) ->
-    [X++Extension||X<-ModList].
-
-    
-remove_inlined_files2(Dir,Rule) ->
-    ?line ok=remove_inlined_files3(Dir,Rule),
-    TargetErl=filename:join([Dir,"inlined_P_Record.erl"]),
-    TargetBeam=filename:join([Dir,"inlined_P_Record.beam"]),
-    lists:foreach(fun(X) ->
-			  ?line ok=file:delete(X)
-		  end,[TargetErl,TargetBeam]),
-    ok.
-remove_inlined_files3(Dir,ber) ->
-    Erl=filename:join([Dir,"P-Record.erl"]),
-    Beam=filename:join([Dir,"P-Record.beam"]),
-    Asn1DB=filename:join([Dir,"P-Record.asn1db"]),
-    Hrl=filename:join([Dir,"P-Record.hrl"]),
-    lists:foreach(fun(X) ->
-			  ?line ok=file:delete(X)
-		  end,[Erl,Beam,Asn1DB,Hrl]),
-    ok;
-remove_inlined_files3(_,_) ->
-    ok.
-
-remove_inlined_files4(Dir,ber) ->
-    Erl=filename:join([Dir,"p_record.erl"]),
-    Beam=filename:join([Dir,"p_record.beam"]),
-    Asn1DB=filename:join([Dir,"p_record.asn1db"]),
-    Hrl=filename:join([Dir,"p_record.hrl"]),
-    ErlBak=filename:join([Dir,"p_record.erl.bak"]),
-    file:delete(ErlBak),
-    lists:foreach(fun(X) ->
-			  ?line ok=file:delete(X)
-		  end,[Erl,Beam,Asn1DB,Hrl]),
-    ok;
-remove_inlined_files4(_,_) ->
-    ok.