Merge branch 'maint'

* maint: (24 commits)
  No longer compile the X420 specs for plain BER
  Combine the testSeqIndefinite/1 and testSetIndefinite/1 test cases
  Remove asn1_wrapper
  Eliminate the use of asn1_wrapper
  Simplify tests of CHOICE with OPTIONAL
  asn1_test_lib: Add roundtrip functions and use them everywhere
  Makefile: Release Emakefile to ensure warnings are treated as errors
  Don't allow unused exported functions in test case helpers
  Move out specific tests from asn1_test_lib
  testMegaco: Remove unused exported function msg11/0
  ASN.1 tests: Don't export functions that are only locally called
  Remove unused pem_performance.erl file
  asn1_SUITE: Reinstate test of sub-constraint
  ASN.1 tests: Remove unused choice_extension.erl
  Remove unused compile() functions
  asn1_test_lib: Remove unnecessary loading of a compiled ASN.1 spec
  Slightly clean up testX420
  asn1_SUITE: Combine most tests that use External.asn1
  asn1ct_gen: Clean up process dictionary after generating
  asn1ct_parser2: Clean the process dictionary after parsing
  ...

1 files changed, 48 insertions, 140 deletions

diff --git a/lib/asn1/test/testSeqOfExternal.erl b/lib/asn1/test/testSeqOfExternal.erl
index 4c4c9e2b0f..2e60f441c1 100644
--- a/lib/asn1/test/testSeqOfExternal.erl
+++ b/lib/asn1/test/testSeqOfExternal.erl
@@ -18,9 +18,6 @@
 %%
 %%
 -module(testSeqOfExternal).
-
-
--export([compile/3]).
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -30,142 +27,53 @@
 -record('Imp',{os, bool}).
 -record('Exp',{os, bool}).
 
-
-
-compile(Config,Rules,Options) ->
-
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-    ?line true = code:add_patha(?config(priv_dir,Config)),
-    ?line ok = asn1ct:compile(DataDir ++ "SeqOfExternal",[Rules,{outdir,OutDir}]++Options).
-
-
-
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqOfExternal','NTNT',[#'NT'{bool = true, os = "kalle"},
-					      #'NT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','NTNT',lists:flatten(Bytes11)),
-
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SeqOfExternal','ImpNT',[#'NT'{bool = true, os = "kalle"},
-					       #'NT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ImpNT',lists:flatten(Bytes12)),
-
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SeqOfExternal','ExpNT',[#'NT'{bool = true, os = "kalle"},
-					       #'NT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ExpNT',lists:flatten(Bytes13)),
-
-    
-
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqOfExternal','NTImp',[#'Imp'{bool = true, os = "kalle"},
-					       #'Imp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','NTImp',lists:flatten(Bytes21)),
-
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SeqOfExternal','ImpImp',[#'Imp'{bool = true, os = "kalle"},
-						#'Imp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ImpImp',lists:flatten(Bytes22)),
-
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SeqOfExternal','ExpImp',[#'Imp'{bool = true, os = "kalle"},
-						#'Imp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ExpImp',lists:flatten(Bytes23)),
-
-
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SeqOfExternal','NTExp',[#'Exp'{bool = true, os = "kalle"},
-					       #'Exp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','NTExp',lists:flatten(Bytes31)),
-
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SeqOfExternal','ImpExp',[#'Exp'{bool = true, os = "kalle"},
-						#'Exp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ImpExp',lists:flatten(Bytes32)),
-
-    ?line {ok,Bytes33} = 
-	asn1_wrapper:encode('SeqOfExternal','ExpExp',[#'Exp'{bool = true, os = "kalle"},
-						#'Exp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ExpExp',lists:flatten(Bytes33)),
-
-
-
-
-
-
-
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SeqOfExternal','XNTNT',[#'XSeqNT'{bool = true, os = "kalle"},
-					       #'XSeqNT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqNT',[107,97,108,108,101],true},{'XSeqNT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XNTNT',lists:flatten(Bytes41)),
-
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SeqOfExternal','XImpNT',[#'XSeqNT'{bool = true, os = "kalle"},
-						#'XSeqNT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqNT',[107,97,108,108,101],true},{'XSeqNT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XImpNT',lists:flatten(Bytes42)),
-
-    ?line {ok,Bytes43} = 
-	asn1_wrapper:encode('SeqOfExternal','XExpNT',[#'XSeqNT'{bool = true, os = "kalle"},
-						#'XSeqNT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqNT',[107,97,108,108,101],true},{'XSeqNT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XExpNT',lists:flatten(Bytes43)),
-
-    
-
-    ?line {ok,Bytes51} = 
-	asn1_wrapper:encode('SeqOfExternal','XNTImp',[#'XSeqImp'{bool = true, os = "kalle"},
-						#'XSeqImp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqImp',[107,97,108,108,101],true},{'XSeqImp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XNTImp',lists:flatten(Bytes51)),
-
-    ?line {ok,Bytes52} = 
-	asn1_wrapper:encode('SeqOfExternal','XImpImp',[#'XSeqImp'{bool = true, os = "kalle"},
-						 #'XSeqImp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqImp',[107,97,108,108,101],true},{'XSeqImp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XImpImp',lists:flatten(Bytes52)),
-
-    ?line {ok,Bytes53} = 
-	asn1_wrapper:encode('SeqOfExternal','XExpImp',[#'XSeqImp'{bool = true, os = "kalle"},
-						 #'XSeqImp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqImp',[107,97,108,108,101],true},{'XSeqImp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XExpImp',lists:flatten(Bytes53)),
-
-
-    
-    ?line {ok,Bytes61} = 
-	asn1_wrapper:encode('SeqOfExternal','XNTExp',[#'XSeqExp'{bool = true, os = "kalle"},
-						#'XSeqExp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqExp',[107,97,108,108,101],true},{'XSeqExp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XNTExp',lists:flatten(Bytes61)),
-
-    ?line {ok,Bytes62} = 
-	asn1_wrapper:encode('SeqOfExternal','XImpExp',[#'XSeqExp'{bool = true, os = "kalle"},
-						 #'XSeqExp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqExp',[107,97,108,108,101],true},{'XSeqExp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XImpExp',lists:flatten(Bytes62)),
-
-    ?line {ok,Bytes63} = 
-	asn1_wrapper:encode('SeqOfExternal','XExpExp',[#'XSeqExp'{bool = true, os = "kalle"},
-						 #'XSeqExp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqExp',[107,97,108,108,101],true},{'XSeqExp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XExpExp',lists:flatten(Bytes63)),
-
-
-    
-    
+    roundtrip('NTNT',
+	      [#'NT'{os="kalle",bool=true},#'NT'{os="kalle",bool=true}]),
+    roundtrip('ImpNT',
+	      [#'NT'{os="kalle",bool=true},#'NT'{os="kalle",bool=true}]),
+    roundtrip('ExpNT',
+	      [#'NT'{os="kalle",bool=true},#'NT'{os="kalle",bool=true}]),
+    roundtrip('NTImp',
+	      [#'Imp'{os="kalle",bool=true},#'Imp'{os="kalle",bool=true}]),
+    roundtrip('ImpImp',
+	      [#'Imp'{os="kalle",bool=true},#'Imp'{os="kalle",bool=true}]),
+    roundtrip('ExpImp',
+	      [#'Imp'{os="kalle",bool=true},#'Imp'{os="kalle",bool=true}]),
+    roundtrip('NTExp',
+	      [#'Exp'{os="kalle",bool=true},#'Exp'{os="kalle",bool=true}]),
+    roundtrip('ImpExp',
+	      [#'Exp'{os="kalle",bool=true},#'Exp'{os="kalle",bool=true}]),
+    roundtrip('ExpExp',
+	      [#'Exp'{os="kalle",bool=true},#'Exp'{os="kalle",bool=true}]),
+    roundtrip('XNTNT',
+	      [#'XSeqNT'{os="kalle",bool=true},
+	       #'XSeqNT'{os="kalle",bool=true}]),
+    roundtrip('XImpNT',
+	      [#'XSeqNT'{os="kalle",bool=true},
+	       #'XSeqNT'{os="kalle",bool=true}]),
+    roundtrip('XExpNT',
+	      [#'XSeqNT'{os="kalle",bool=true},
+	       #'XSeqNT'{os="kalle",bool=true}]),
+    roundtrip('XNTImp',
+	      [#'XSeqImp'{os="kalle",bool=true},
+	       #'XSeqImp'{os="kalle",bool=true}]),
+    roundtrip('XImpImp',
+	      [#'XSeqImp'{os="kalle",bool=true},
+	       #'XSeqImp'{os="kalle",bool=true}]),
+    roundtrip('XExpImp',
+	      [#'XSeqImp'{os="kalle",bool=true},
+	       #'XSeqImp'{os="kalle",bool=true}]),
+    roundtrip('XNTExp',
+	      [#'XSeqExp'{os="kalle",bool=true},
+	       #'XSeqExp'{os="kalle",bool=true}]),
+    roundtrip('XImpExp',
+	      [#'XSeqExp'{os="kalle",bool=true},
+	       #'XSeqExp'{os="kalle",bool=true}]),
+    roundtrip('XExpExp',
+	      [#'XSeqExp'{os="kalle",bool=true},
+	       #'XSeqExp'{os="kalle",bool=true}]),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SeqOfExternal', T, V).