Add kernel/test/code_SUITE:upgrade

For now we only test beam as hipe doesn't pass the test

3 files changed, 420 insertions, 0 deletions

diff --git a/lib/kernel/test/code_SUITE_data/other.erl b/lib/kernel/test/code_SUITE_data/other.erl
new file mode 100644
index 0000000000..58ce87f222
--- /dev/null
+++ b/lib/kernel/test/code_SUITE_data/other.erl
@@ -0,0 +1,38 @@
+-module(other).
+
+-ifdef(VERSION_1).
+-define(VERSION,1).
+-export([exp1/0]).
+-export([exp1loc2/0]).
+-export([exp1exp2/0]).
+exp1() -> check([loc1(),exp1loc2(),exp1exp2(),loc1exp2(),loc1loc2()]).
+loc1() -> check([exp1loc2(),exp1exp2(),loc1exp2(),loc1loc2()]).
+exp1loc2() -> check([exp1exp2(),loc1exp2(),loc1loc2()]).
+exp1exp2() -> check([loc1exp2(),loc1loc2()]).
+loc1exp2() -> check([loc1loc2()]).
+-endif. % VERSION_1
+
+-ifdef(VERSION_2).
+-define(VERSION,2).
+-export([exp2/0]).
+-export([loc1exp2/0]).
+-export([exp1exp2/0]).
+loc1exp2() -> check([exp1exp2(),exp1loc2(),loc2(),exp2(),loc1loc2()]).
+exp1exp2() -> check([exp1loc2(),loc2(),exp2(),loc1loc2()]).
+exp1loc2() -> check([loc2(),exp2(),loc1loc2()]).
+loc2() -> check([exp2(),loc1loc2()]).
+exp2() -> check([loc1loc2()]).
+
+-endif. % VERSION_2
+
+loc1loc2() -> ?VERSION.
+
+
+check(VerList) ->
+    case lists:all(fun(?VERSION) -> true; (_) -> false end,
+		   VerList) of
+	true ->
+	    ?VERSION;
+	false ->
+	    VerList
+    end.
diff --git a/lib/kernel/test/code_SUITE_data/upgrade_client.erl b/lib/kernel/test/code_SUITE_data/upgrade_client.erl
new file mode 100644
index 0000000000..bb655e01d3
--- /dev/null
+++ b/lib/kernel/test/code_SUITE_data/upgrade_client.erl
@@ -0,0 +1,259 @@
+-module(upgrade_client).
+
+-export([run/5]).
+
+%%-define(line, io:format("~s:~p\n", [?MODULE,?LINE]),).
+-define(line,).    
+
+run(Dir, Upgradee1, Upgradee2, Other1, Other2) ->
+    %% Load version 1 of upgradee
+    code_SUITE:compile_load(upgradee, Dir, 1, Upgradee1),
+
+    ?line 1 = upgradee:exp1(),
+    ?line 1 = upgradee:exp1exp2(),
+    ?line 1 = upgradee:exp1loc2(),
+
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1exp2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1loc2()),
+
+    P = spawn_link(upgradee,dispatch_loop,[]),
+
+    ?line 1 = proxy_call(P, local, exp1),
+    ?line 1 = proxy_call(P, local, loc1),
+    ?line 1 = proxy_call(P, local, exp1exp2),
+    ?line 1 = proxy_call(P, local, exp1loc2),
+    ?line 1 = proxy_call(P, local, loc1exp2),
+    ?line 1 = proxy_call(P, local, loc1loc2),
+    ?line 1 = proxy_call(P, external, exp1),
+    ?line 1 = proxy_call(P, external, exp1exp2),
+    ?line 1 = proxy_call(P, external, exp1loc2),
+
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc2),
+    ?line {cannot_compile,1} = proxy_call(P, local, exp2),
+    ?line {cannot_compile,1} = proxy_call(P, local, loc2),
+
+    ?line {'EXIT',{undef,_}} = (catch other:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc11exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc2()),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc2),
+
+    %%
+    %% Load version 1 of other
+    %%
+    code_SUITE:compile_load(other, Dir, 1, Other1),
+    ?line 1 = other:exp1(),
+    ?line 1 = other:exp1loc2(),
+    ?line 1 = other:exp1exp2(),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc2()),
+
+    ?line 1 = proxy_call(P, other, exp1),
+    ?line 1 = proxy_call(P, other, exp1loc2),
+    ?line 1 = proxy_call(P, other, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc2),
+
+    %%
+    %% Load version 2 of upgradee
+    %%
+    code_SUITE:compile_load(upgradee, Dir, 2, Upgradee2),
+
+    ?line 2 = upgradee:exp2(),
+    ?line 2 = upgradee:exp1exp2(),
+    ?line 2 = upgradee:loc1exp2(),
+    
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc2()),
+
+    ?line 1 = proxy_call(P, local, exp1),
+    ?line 1 = proxy_call(P, local, loc1),
+    ?line 1 = proxy_call(P, local, exp1exp2),
+    ?line 1 = proxy_call(P, local, exp1loc2),
+    ?line 1 = proxy_call(P, local, loc1exp2),
+    ?line 1 = proxy_call(P, local, loc1loc2),
+    ?line {cannot_compile,1} = proxy_call(P, local, exp2),
+    ?line {cannot_compile,1} = proxy_call(P, local, loc2),
+
+    ?line 2 = proxy_call(P, external, exp1exp2),
+    ?line 2 = proxy_call(P, external, loc1exp2),
+    ?line 2 = proxy_call(P, external, exp2),
+
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1),    
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc2),
+
+    ?line 1 = other:exp1(),
+    ?line 1 = other:exp1loc2(),
+    ?line 1 = other:exp1exp2(),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc2()),
+
+    ?line 1 = proxy_call(P, other, exp1),
+    ?line 1 = proxy_call(P, other, exp1loc2),
+    ?line 1 = proxy_call(P, other, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc2),
+
+    %%
+    %% Load version 2 of other
+    %%
+    code_SUITE:compile_load(other, Dir, 2, Other2),
+
+    ?line 2 = upgradee:exp2(),
+    ?line 2 = upgradee:exp1exp2(),
+    ?line 2 = upgradee:loc1exp2(),
+    
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc2()),
+
+    ?line 1 = proxy_call(P, local, exp1),
+    ?line 1 = proxy_call(P, local, loc1),
+    ?line 1 = proxy_call(P, local, exp1exp2),
+    ?line 1 = proxy_call(P, local, exp1loc2),
+    ?line 1 = proxy_call(P, local, loc1exp2),
+    ?line 1 = proxy_call(P, local, loc1loc2),
+    ?line {cannot_compile,1} = proxy_call(P, local, exp2),
+    ?line {cannot_compile,1} = proxy_call(P, local, loc2),
+
+    ?line 2 = proxy_call(P, external, exp1exp2),
+    ?line 2 = proxy_call(P, external, loc1exp2),
+    ?line 2 = proxy_call(P, external, exp2),
+
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1),    
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc2),
+
+    ?line 2 = other:exp2(),
+    ?line 2 = other:loc1exp2(),
+    ?line 2 = other:exp1exp2(),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc2()),
+
+    ?line 2 = proxy_call(P, other, exp2),
+    ?line 2 = proxy_call(P, other, loc1exp2),
+    ?line 2 = proxy_call(P, other, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc2),
+
+
+    %%
+    %% Upgrade proxy to version 2
+    %%
+    P ! upgrade_order,
+
+    
+    %%
+    io:format("Delete version 2 of 'upgradee'\n",[]),
+    %%
+    code:purge(upgradee),
+    code:delete(upgradee),
+    
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1exp2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1exp2()),    
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch upgradee:loc2()),
+    
+    ?line 2 = proxy_call(P, local, exp2),
+    ?line 2 = proxy_call(P, local, loc2),
+    ?line 2 = proxy_call(P, local, exp1exp2),
+    ?line 2 = proxy_call(P, local, exp1loc2),
+    ?line 2 = proxy_call(P, local, loc1exp2),
+    ?line 2 = proxy_call(P, local, loc1loc2),
+    ?line {cannot_compile,2} = proxy_call(P, local, exp1),
+    ?line {cannot_compile,2} = proxy_call(P, local, loc1),
+    
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1),    
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, external, loc2),
+    
+    ?line 2 = other:exp2(),
+    ?line 2 = other:loc1exp2(),
+    ?line 2 = other:exp1exp2(),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1()),
+    ?line {'EXIT',{undef,_}} = (catch other:exp1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc1loc2()),
+    ?line {'EXIT',{undef,_}} = (catch other:loc2()),
+    
+    ?line 2 = proxy_call(P, other, exp2),
+    ?line 2 = proxy_call(P, other, loc1exp2),
+    ?line 2 = proxy_call(P, other, exp1exp2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, exp1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc1loc2),
+    ?line {'EXIT',{undef,_}} = proxy_call(P, other, loc2),
+    
+    unlink(P),
+    exit(P, die_please),
+
+    io:format("Purge 'upgradee'\n",[]),
+    code:purge(upgradee),
+
+    io:format("Delete and purge 'other'\n",[]),
+    code:purge(other),
+    code:delete(other),
+    code:purge(other),
+    ok.
+
+proxy_call(Pid, CallType, Func) ->
+    Pid ! {self(), CallType, Func},
+    receive
+	{Pid, call_result, Func, Ret} -> Ret
+    end.
diff --git a/lib/kernel/test/code_SUITE_data/upgradee.erl b/lib/kernel/test/code_SUITE_data/upgradee.erl
new file mode 100644
index 0000000000..62b1d95e30
--- /dev/null
+++ b/lib/kernel/test/code_SUITE_data/upgradee.erl
@@ -0,0 +1,123 @@
+-module(upgradee).
+
+-export([dispatch_loop/0]).
+
+-ifdef(VERSION_1).
+-define(VERSION,1).
+
+-export([exp1/0]).     % only exported in v1
+-export([exp1loc2/0]). % exported in v1, local in v2
+-export([exp1exp2/0]). % exported in v1 and v2
+
+exp1() -> ?VERSION.
+loc1() -> ?VERSION.
+
+-endif. % VERSION_1
+
+-ifdef(VERSION_2).
+-define(VERSION,2).
+
+-export([exp2/0]).
+-export([loc1exp2/0]).
+-export([exp1exp2/0]).
+
+exp2() -> ?VERSION.
+loc2() -> ?VERSION.
+
+-endif. % VERSION_2
+
+exp1exp2() -> ?VERSION.
+exp1loc2() -> ?VERSION.
+loc1exp2() -> ?VERSION.
+loc1loc2() -> ?VERSION.
+
+dispatch_loop() ->
+    receive 
+	upgrade_order ->
+	    %%erlang:display({"upgradee version", ?VERSION, "got upgrade_order"}),
+	    ?MODULE:dispatch_loop();
+
+	Msg -> 
+	    %%erlang:display({"upgradee version", ?VERSION, "got msg", Msg}),
+	    {Func,Ret} = case Msg of
+			     %% Local calls
+			     {Pid, local, F=exp1} ->
+				 {F, local_exp1()};
+			     {Pid, local, F=loc1} ->
+				 {F, local_loc1()};
+			     {Pid, local, F=exp1exp2} ->
+				 {F, catch exp1exp2()};
+			     {Pid, local, F=exp1loc2} ->
+				 {F, catch exp1loc2()};
+			     {Pid, local, F=loc1exp2} ->
+				 {F, catch loc1exp2()};
+			     {Pid, local, F=loc1loc2} ->
+				 {F, catch loc1loc2()};
+			     {Pid, local, F=exp2} ->
+				 {F, local_exp2()};
+			     {Pid, local, F=loc2} ->
+				 {F, local_loc2()};
+			     
+			     %% Extern calls to own module
+			     {Pid, external, F=exp1} ->
+				 {F, catch ?MODULE:exp1()};
+			     {Pid, external, F=loc1} ->
+				 {F, catch ?MODULE:loc1()};
+			     {Pid, external, F=exp1exp2} ->
+				 {F, catch ?MODULE:exp1exp2()};
+			     {Pid, external, F=exp1loc2} ->
+				 {F, catch ?MODULE:exp1loc2()};
+			     {Pid, external, F=loc1exp2} ->
+				 {F, catch ?MODULE:loc1exp2()};
+			     {Pid, external, F=loc1loc2} ->
+				 {F, catch ?MODULE:loc1loc2()};
+			     {Pid, external, F=exp2} ->
+				 {F, catch ?MODULE:exp2()};
+			     {Pid, external, F=loc2} ->
+				 {F, catch ?MODULE:loc2()};
+			     
+			     %% External calls to other module
+			     {Pid, other, F=exp1} ->
+				 {F, catch other:exp1()};
+			     {Pid, other, F=loc1} ->
+				 {F, catch other:loc1()};
+			     {Pid, other, F=exp1exp2} ->
+				 {F, catch other:exp1exp2()};
+			     {Pid, other, F=exp1loc2} ->
+				 {F, catch other:exp1loc2()};
+			     {Pid, other, F=loc1exp2} ->
+				 {F, catch other:loc1exp2()};
+			     {Pid, other, F=loc1loc2} ->
+				 {F, catch other:loc1loc2()};
+			     {Pid, other, F=exp2} ->
+				 {F, catch other:exp2()};
+			     {Pid, other, F=loc2} ->
+				 {F, catch other:loc2()}
+			 end,
+	    Pid ! {self(), call_result, Func, Ret},
+	    
+	    dispatch_loop() % A local call, we don't want to upgrade the dispatcher
+    end.
+
+
+
+-ifdef(VERSION_1).
+local_exp1() -> catch exp1().
+local_loc1() -> catch loc1().
+-else.
+local_exp1() ->
+    %%erlang:display({"upgradee:local_exp1 in version", ?VERSION}),
+    {cannot_compile,?VERSION}.
+local_loc1() -> {cannot_compile,?VERSION}.
+-endif.
+
+-ifdef(VERSION_2).
+local_exp2() -> catch exp2().
+local_loc2() -> catch loc2().
+-else.
+local_exp2() -> 
+    %%erlang:display({"upgradee:local_exp2 in version", ?VERSION}),
+    {cannot_compile,?VERSION}.
+local_loc2() -> 
+    {cannot_compile,?VERSION}.
+-endif.