Clean up error reporting for duplicate tags

Split the test case duplicate_tags/1 into two parts. Do the
error checking test in error_SUITE. Keep the SeqOptional2
specification and compile it from the per/1 and ber_other/1
test cases (for coverage).

3 files changed, 53 insertions, 14 deletions

diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 3b6e18c46d..04ebbab599 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -148,7 +148,6 @@ groups() ->
        testMvrasn6,
        testContextSwitchingTypes,
        testOpenTypeImplicitTag,
-       duplicate_tags,
        testROSE,
        testINSTANCE_OF,
        testTCAP,
@@ -869,14 +868,6 @@ testOpenTypeImplicitTag(Config, Rule, Opts) ->
     asn1_test_lib:compile("OpenTypeImplicitTag", Config, [Rule|Opts]),
     testOpenTypeImplicitTag:main(Rule).
 
-duplicate_tags(Config) ->
-    DataDir = ?config(data_dir, Config),
-    CaseDir = ?config(case_dir, Config),
-    {error, [{error, {type, _, _, 'SeqOpt1Imp',
-			     {asn1, {duplicates_of_the_tags, _}}}}]} =
-	asn1ct:compile(filename:join(DataDir, "SeqOptional2"),
-		       [abs, {outdir, CaseDir}]).
-
 rtUI(Config) -> test(Config, fun rtUI/3).
 rtUI(Config, Rule, Opts) ->
     asn1_test_lib:compile("Prim", Config, [Rule|Opts]),
@@ -1147,7 +1138,8 @@ test_modules() ->
      "Def",
      "Opt",
      "ELDAPv3",
-     "LDAP"].
+     "LDAP",
+     "SeqOptional2"].
 
 test_OTP_9688(Config) ->
     PrivDir = ?config(case_dir, Config),
diff --git a/lib/asn1/test/asn1_SUITE_data/SeqOptional2.asn b/lib/asn1/test/asn1_SUITE_data/SeqOptional2.asn
index 7de9134096..bb85c9e418 100644
--- a/lib/asn1/test/asn1_SUITE_data/SeqOptional2.asn
+++ b/lib/asn1/test/asn1_SUITE_data/SeqOptional2.asn
@@ -15,10 +15,10 @@ SeqOpt1Imp ::= SEQUENCE
   bool1 [1] BOOLEAN OPTIONAL,
   int1  INTEGER,
   seq1  [2] SeqIn OPTIONAL,
-  seq2  [2] SeqIn OPTIONAL,
+  seq2  [3] SeqIn OPTIONAL,
   ...,
-  int2  [3] SeqIn,
-  int3  [3] SeqIn
+  int2  [4] SeqIn,
+  int3  [5] SeqIn
 }
 
 SeqOpt1Exp ::= SEQUENCE 
diff --git a/lib/asn1/test/error_SUITE.erl b/lib/asn1/test/error_SUITE.erl
index c386fd6d31..83ef5f226e 100644
--- a/lib/asn1/test/error_SUITE.erl
+++ b/lib/asn1/test/error_SUITE.erl
@@ -24,7 +24,7 @@
 	 imports_exports/1,instance_of/1,integers/1,objects/1,
 	 object_field_extraction/1,oids/1,rel_oids/1,
 	 object_sets/1,parameterization/1,
-	 syntax/1,table_constraints/1,values/1]).
+	 syntax/1,table_constraints/1,tags/1,values/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -51,6 +51,7 @@ groups() ->
        parameterization,
        syntax,
        table_constraints,
+       tags,
        values]}].
 
 parallel() ->
@@ -652,6 +653,52 @@ table_constraints(Config) ->
      ]} = run(P, Config),
     ok.
 
+tags(Config) ->
+    M = 'Tags',
+    P = {M,
+	 <<"Tags DEFINITIONS AUTOMATIC TAGS ::= BEGIN\n"
+	   "SeqOpt1 ::= SEQUENCE\n"
+	   "{\n"
+	   "bool1  BOOLEAN OPTIONAL,\n"
+	   "int1  INTEGER,\n"
+	   "seq1  SeqIn OPTIONAL\n"
+	   "}\n"
+
+	   "SeqOpt1Imp ::= SEQUENCE \n"
+	   "{\n"
+	   "bool1 [1] BOOLEAN OPTIONAL,\n"
+	   "int1  INTEGER,\n"
+	   "seq1  [2] SeqIn OPTIONAL,\n"
+	   "seq2  [2] SeqIn OPTIONAL,\n"
+	   "...,\n"
+	   "int2  [3] SeqIn,\n"
+	   "int3  [3] SeqIn\n"
+	   "}\n"
+
+	   "SeqIn ::= SEQUENCE \n"
+	   "{\n"
+	   "boolIn  BOOLEAN,\n"
+	   "intIn  INTEGER\n"
+	   "}\n"
+	   "\n"
+
+	   "Set1 ::= SET {\n"
+	   " os [0] OCTET STRING,\n"
+	   " bool [0] BOOLEAN\n"
+	   "}\n"
+
+	   "END\n">>},
+    {error,
+     [{structured_error,
+       {M,8},asn1ct_check,
+       {duplicate_tags,[seq1,seq2]}},
+      {structured_error,
+       {M,24},asn1ct_check,
+       {duplicate_tags,[bool,os]}}
+     ]} = run(P, Config),
+    ok.
+
+
 values(Config) ->
     M = 'Values',
     P = {M,