Merge branch 'maint-r13' into dev

* maint-r13:
  asn1 tests: Remove duplicated SUITE data directories
  Update of vsn.mk, relnotes and appup for patch in R13B04 track
  Add support for Extension addition group

Conflicts:
	lib/asn1/test/Makefile
	lib/asn1/test/asn1_SUITE.erl.src
	lib/asn1/vsn.mk

OTP-8598

5 files changed, 135 insertions, 22 deletions

diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 5014eb902b..e8f65ec70b 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -189,27 +189,16 @@ release_spec: opt
 
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) asn1.spec $(EMAKEFILE) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	chmod -f -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) $(RELSYSDIR)/asn1_SUITE_data
 	$(INSTALL_DIR) $(RELSYSDIR)/asn1_bin_SUITE_data
-	@(cd asn1_SUITE_data; tar cf - *) | (cd $(RELSYSDIR)/asn1_bin_SUITE_data; tar xf -)
 	$(INSTALL_DIR) $(RELSYSDIR)/asn1_bin_v2_SUITE_data
-	@(cd asn1_SUITE_data; tar cf - *) | (cd $(RELSYSDIR)/asn1_bin_v2_SUITE_data; tar xf -)
-
+	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) asn1.spec $(INSTALL_PROGS) $(RELSYSDIR)
+	chmod -f -R u+w $(RELSYSDIR)
+	cd asn1_SUITE_data; tar cfh $(RELSYSDIR)/asn1_SUITE_data.tar *
+	cd $(RELSYSDIR)/asn1_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar
+	cd $(RELSYSDIR)/asn1_bin_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar
+	cd $(RELSYSDIR)/asn1_bin_v2_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar
+	rm $(RELSYSDIR)/asn1_SUITE_data.tar
 
 release_docs_spec:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/asn1/test/asn1_SUITE.erl.src b/lib/asn1/test/asn1_SUITE.erl.src
index ca73d259af..f0228546a5 100644
--- a/lib/asn1/test/asn1_SUITE.erl.src
+++ b/lib/asn1/test/asn1_SUITE.erl.src
@@ -74,6 +74,7 @@ all(suite) -> [compile,parse,default_per,default_ber,default_per_opt,per,
 	       testSeqTypeRefPrim, testSeqTypeRefSeq, testSeqTypeRefSet, 
 	       testSeqOf, testSeqOfIndefinite, testSeqOfCho, 
 	       testSeqOfExternal, testSetDefault, testSetExtension, 
+	       testExtensionAdditionGroup,
 	       testSetExternal, testSeqOfTag, testSetOptional, testSetPrim, 
 	       testSetTag, testSetTypeRefCho, testSetTypeRefPrim,
 	       testSetTypeRefSeq, testSetTypeRefSet, testSetOf, testSetOfCho,
@@ -95,7 +96,7 @@ all(suite) -> [compile,parse,default_per,default_ber,default_per_opt,per,
 	       testSSLspecs, testNortel,test_undecoded_rest,
 	       test_inline, testTcapsystem, testNBAPsystem,
 	       test_compile_options,testDoubleEllipses, test_modified_x420,
-	       testX420, test_x691,ticket_6143
+	       testX420, test_x691,ticket_6143, testExtensionAdditionGroup
                ] ++ common() ++ particular().
 
 %all(suite) -> [test_inline,testNBAPsystem,test_compile_options,ticket_6143].
@@ -1036,7 +1037,6 @@ testSetExtension_cases(Rules) ->
     ?line testSetExtension:main(Rules).
 
 
-
 testSetExternal(suite) -> [];
 testSetExternal(Config) ->
     ?line true = code:add_patha(?config(priv_dir,Config)),
@@ -2292,6 +2292,21 @@ ticket_6143(suite) -> [];
 ticket_6143(Config) ->
     ?line ok = test_compile_options:ticket_6143(Config).
 
+testExtensionAdditionGroup(suite) -> [];
+testExtensionAdditionGroup(Config) ->
+	?line DataDir = ?config(data_dir,Config),
+	?line PrivDir = ?config(priv_dir,Config),
+	?line Path = code:get_path(),
+	?line code:add_patha(PrivDir),
+	DoIt = fun(Erule) ->
+		?line ok = asn1ct:compile(filename:join(DataDir,"Extension-Addition-Group"),[Erule,{outdir,PrivDir}]),
+		?line {ok,_M} = compile:file(filename:join(DataDir,"extensionAdditionGroup"),[{i,PrivDir},{outdir,PrivDir},debug_info]),
+		?line ok = extensionAdditionGroup:run(Erule)
+	       end,
+	?line [DoIt(Rule)|| Rule <- [per_bin,uper_bin,ber_bin]],
+	?line code:set_path(Path).
+
+
 
 % parse_modules() ->
 %	["ImportsFrom"].
diff --git a/lib/asn1/test/asn1_SUITE_data/AA2.asn1db b/lib/asn1/test/asn1_SUITE_data/AA2.asn1db
index 3bf2c1b89d..163dbb032d 100644
--- a/lib/asn1/test/asn1_SUITE_data/AA2.asn1db
+++ b/lib/asn1/test/asn1_SUITE_data/AA2.asn1db
diff --git a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
new file mode 100644
index 0000000000..b985c970ac
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
@@ -0,0 +1,66 @@
+--
+-- %CopyrightBegin%
+--
+-- Copyright Ericsson AB 2001-2010. 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%
+
+Extension-Addition-Group DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+-- fetched from ITU-T Rec. X691 (07/2002)
+
+Ax ::= SEQUENCE {
+    a INTEGER (250..253),
+    b BOOLEAN,
+    c CHOICE {
+        d INTEGER,
+	...,
+
+	[[
+	    e BOOLEAN,
+	    f IA5String
+	]],
+	...
+    },
+    ...,
+    [[
+        g NumericString (SIZE(3)),
+	h BOOLEAN OPTIONAL
+    ]]
+,
+    ...,
+    i BMPString OPTIONAL,
+    j PrintableString OPTIONAL
+
+}
+
+-- valAx Ax ::= { a 253, b TRUE, c e: TRUE, g "123", h TRUE }
+Ax2 ::= SEQUENCE {
+    a INTEGER (250..253),
+    b BOOLEAN,
+    ...,
+    ug NumericString
+
+}
+END
+
+-- The value { a 253, b TRUE, c e: TRUE, g "123", h TRUE }
+-- is encoded in PER as
+-- Hexadecimal view
+-- 9E000180 010291A4
+
+-- is encoded in Unaligned PER as
+-- 9E000600 040A4690
diff --git a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
new file mode 100644
index 0000000000..79e200f561
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
@@ -0,0 +1,43 @@
+%%%-------------------------------------------------------------------
+%%% File    : extensionAdditionGroup.erl
+%%% Author  : Kenneth Lundin
+%%% Description :
+%%%
+%%% Created : 18 May 2010 by kenneth
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2010. 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(extensionAdditionGroup).
+-include("Extension-Addition-Group.hrl").
+
+
+-compile(export_all).
+
+run(Erule) ->
+    Val = #'Ax'{a=253, b = true, c= {e,true}, g="123", h = true},
+    io:format("~p:~p~n",[Erule,Val]),
+    {ok,List}= asn1rt:encode('Extension-Addition-Group','Ax',Val),
+    Enc = iolist_to_binary(List),
+    io:format("~p~n",[Enc]),
+    {ok,Val2} = asn1rt:decode('Extension-Addition-Group','Ax',Enc),
+    io:format("~p~n",[Val2]),
+    case Val2 of
+	Val -> ok;
+	_ -> exit({expected,Val, got, Val2})
+    end.