[reltool] Add test of dependencies derived through calls to external apps

OTP-9794

This is a test of the mechanism with which reltool_server decides
which applications to include and not, based on function calls between
applications. This is also the mechanism which forms the base for the
application- and module dependency graphs.

11 files changed, 214 insertions, 2 deletions

diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index 588db837e4..90288020f1 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -57,7 +57,8 @@ all() ->
      create_standalone, create_old_target,
      otp_9135, otp_9229_exclude_app, otp_9229_exclude_mod,
      get_apps, set_app_and_undo, set_apps_and_undo,
-     load_config_and_undo, reset_config_and_undo, save_config].
+     load_config_and_undo, reset_config_and_undo, save_config,
+     dependencies].
 
 groups() -> 
     [].
@@ -837,6 +838,143 @@ save_config(Config) ->
     ?m(ok, reltool:stop(Pid)),
     ok.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Test calculation of dependencies
+%% The following test applications are used
+%%
+%% x-1.0: x1.erl   x2.erl   x3.erl
+%%                   \        /         (x2 calls y1, x3 calls y2)
+%% y-1.0:          y1.erl   y2.erl
+%%                    \                 (y1 calls z1)
+%% z-1.0            z1.erl
+%%
+%% Test includes x and derives y and z.
+%%
+dependencies(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+
+    %% Default: all modules included => y and z are included (derived)
+    Sys = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		{incl_cond, exclude},
+		{app,kernel,[{incl_cond,include}]},
+		{app,sasl,[{incl_cond,include}]},
+		{app,stdlib,[{incl_cond,include}]},
+		{app,x,[{incl_cond,include}]},
+		{app,y,[{incl_cond,derived}]},
+		{app,z,[{incl_cond,derived}]}]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
+
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[y]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der} = ?msym({ok,_},
+		      reltool_server:get_apps(Pid,derived)),
+    ?msym([#app{name=y,uses_apps=[z]},
+	   #app{name=z}],
+	  rm_missing_app(Der)),
+    ?msym({ok,[]},
+	  reltool_server:get_apps(Pid,source)),
+
+    %% Excluding x2 => y still included since y2 is used by x3
+    %%                 z still included since z1 is used by y1
+    Sys2 = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		 {incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,x,[{incl_cond,include},{mod,x2,[{incl_cond,exclude}]}]},
+		 {app,y,[{incl_cond,derived}]},
+		 {app,z,[{incl_cond,derived}]}]},
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys2)),
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[y]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der2} = ?msym({ok,_},
+		       reltool_server:get_apps(Pid,derived)),
+    ?msym([#app{name=y,uses_apps=[z]},
+	   #app{name=z}],
+	  rm_missing_app(Der2)),
+    ?msym({ok,[]},
+	  reltool_server:get_apps(Pid,source)),
+
+    %% Excluding x3 => y still included since y1 is used by x2
+    %%                 z still included since z1 is used by y1
+    Sys3 = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		 {incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,x,[{incl_cond,include},{mod,x3,[{incl_cond,exclude}]}]},
+		 {app,y,[{incl_cond,derived}]},
+		 {app,z,[{incl_cond,derived}]}]},
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys3)),
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[y]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der3} = ?msym({ok,_},
+		       reltool_server:get_apps(Pid,derived)),
+    ?msym([#app{name=y,uses_apps=[z]},
+	   #app{name=z}],
+	  rm_missing_app(Der3)),
+    ?msym({ok,[]},
+	  reltool_server:get_apps(Pid,source)),
+
+    %% Excluding x2 and x3 => y and z excluded
+    Sys4 = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		 {incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,x,[{incl_cond,include},
+			 {mod,x2,[{incl_cond,exclude}]},
+			 {mod,x3,[{incl_cond,exclude}]}]},
+		 {app,y,[{incl_cond,derived}]},
+		 {app,z,[{incl_cond,derived}]}]},
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys4)),
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der4} = ?msym({ok,_},
+		       reltool_server:get_apps(Pid,derived)),
+    ?msym([], rm_missing_app(Der4)),
+    ?msym({ok,[#app{name=y},
+	       #app{name=z}]},
+	  reltool_server:get_apps(Pid,source)),
+
+    %% Excluding y1 => y still included since y2 is used by x3
+    %%                 z excluded since not used by any other than y1
+    Sys5 = {sys,[{lib_dirs,[filename:join(datadir(Config),"dependencies")]},
+		 {incl_cond, exclude},
+		 {app,kernel,[{incl_cond,include}]},
+		 {app,sasl,[{incl_cond,include}]},
+		 {app,stdlib,[{incl_cond,include}]},
+		 {app,x,[{incl_cond,include}]},
+		 {app,y,[{incl_cond,derived},
+			 {mod,y1,[{incl_cond,exclude}]}]},
+		 {app,z,[{incl_cond,derived}]}]},
+    ?m({ok,[]}, reltool_server:load_config(Pid,Sys5)),
+    ?msym({ok,[#app{name=kernel},
+	       #app{name=sasl},
+	       #app{name=stdlib},
+	       #app{name=x,uses_apps=[y]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der5} = ?msym({ok,_},
+		       reltool_server:get_apps(Pid,derived)),
+    ?msym([#app{name=y,uses_apps=[]}], rm_missing_app(Der5)),
+    ?msym({ok,[#app{name=z}]},
+	  reltool_server:get_apps(Pid,source)),
+
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Library functions
@@ -858,6 +996,8 @@ latest(App) ->
     [_,Vsn] = string:tokens(filename:basename(LatestAppDir),"-"),
     Vsn.
 
+rm_missing_app(Apps) ->
+    lists:keydelete(?MISSING_APP_NAME,#app.name,Apps).
 
 diff_script(Script, Script) ->
     equal;
diff --git a/lib/reltool/test/reltool_server_SUITE_data/Makefile.src b/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
index 049e8dd6cc..35a239bfe2 100644
--- a/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
+++ b/lib/reltool/test/reltool_server_SUITE_data/Makefile.src
@@ -6,8 +6,16 @@ OTP9229= \
      otp_9229/y-1.0/ebin/y.@EMULATOR@ \
      otp_9229/y-1.0/ebin/mylib.@EMULATOR@
 
+DEPENDENCIES= \
+     dependencies/x-1.0/ebin/x1.@EMULATOR@ \
+     dependencies/x-1.0/ebin/x2.@EMULATOR@ \
+     dependencies/x-1.0/ebin/x3.@EMULATOR@ \
+     dependencies/y-1.0/ebin/y1.@EMULATOR@ \
+     dependencies/y-1.0/ebin/y2.@EMULATOR@ \
+     dependencies/z-1.0/ebin/z1.@EMULATOR@
 
-all: $(OTP9229)
+
+all: $(OTP9229) $(DEPENDENCIES)
 
 otp_9229/x-1.0/ebin/x.@EMULATOR@: otp_9229/x-1.0/src/x.erl
 	erlc $(EFLAGS) -ootp_9229/x-1.0/ebin otp_9229/x-1.0/src/x.erl
@@ -17,3 +25,16 @@ otp_9229/y-1.0/ebin/y.@EMULATOR@: otp_9229/y-1.0/src/y.erl
 	erlc $(EFLAGS) -ootp_9229/y-1.0/ebin otp_9229/y-1.0/src/y.erl
 otp_9229/y-1.0/ebin/mylib.@EMULATOR@: otp_9229/y-1.0/src/mylib.erl
 	erlc $(EFLAGS) -ootp_9229/y-1.0/ebin otp_9229/y-1.0/src/mylib.erl
+
+dependencies/x-1.0/ebin/x1.@EMULATOR@: dependencies/x-1.0/src/x1.erl
+	erlc $(EFLAGS) -odependencies/x-1.0/ebin dependencies/x-1.0/src/x1.erl
+dependencies/x-1.0/ebin/x2.@EMULATOR@: dependencies/x-1.0/src/x2.erl
+	erlc $(EFLAGS) -odependencies/x-1.0/ebin dependencies/x-1.0/src/x2.erl
+dependencies/x-1.0/ebin/x3.@EMULATOR@: dependencies/x-1.0/src/x3.erl
+	erlc $(EFLAGS) -odependencies/x-1.0/ebin dependencies/x-1.0/src/x3.erl
+dependencies/y-1.0/ebin/y1.@EMULATOR@: dependencies/y-1.0/src/y1.erl
+	erlc $(EFLAGS) -odependencies/y-1.0/ebin dependencies/y-1.0/src/y1.erl
+dependencies/y-1.0/ebin/y2.@EMULATOR@: dependencies/y-1.0/src/y2.erl
+	erlc $(EFLAGS) -odependencies/y-1.0/ebin dependencies/y-1.0/src/y2.erl
+dependencies/z-1.0/ebin/z1.@EMULATOR@: dependencies/z-1.0/src/z1.erl
+	erlc $(EFLAGS) -odependencies/z-1.0/ebin dependencies/z-1.0/src/z1.erl
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/ebin/x.app b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/ebin/x.app
new file mode 100644
index 0000000000..ccaab8a8c7
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/ebin/x.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, x,
+ [{description, "Main application in reltool dependency test"},
+  {vsn, "1.0"},
+  {modules, [x1,x2,x3]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x1.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x1.erl
new file mode 100644
index 0000000000..bf1e7f9279
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x1.erl
@@ -0,0 +1,5 @@
+-module(x1).
+-compile(export_all).
+
+f() ->
+    ok.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x2.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x2.erl
new file mode 100644
index 0000000000..82191ba278
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x2.erl
@@ -0,0 +1,5 @@
+-module(x2).
+-compile(export_all).
+
+f() ->
+    y1:f().
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x3.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x3.erl
new file mode 100644
index 0000000000..618c75c9a7
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/x-1.0/src/x3.erl
@@ -0,0 +1,5 @@
+-module(x3).
+-compile(export_all).
+
+f() ->
+    y2:f().
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app
new file mode 100644
index 0000000000..d9dac371d7
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/ebin/y.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, y,
+ [{description, "Library application in reltool dependency test"},
+  {vsn, "1.0"},
+  {modules, [y1,y2]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y1.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y1.erl
new file mode 100644
index 0000000000..dd21b33292
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y1.erl
@@ -0,0 +1,5 @@
+-module(y1).
+-compile(export_all).
+
+f() ->
+    z1:f().
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y2.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y2.erl
new file mode 100644
index 0000000000..bf8ddf6080
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y2.erl
@@ -0,0 +1,5 @@
+-module(y2).
+-compile(export_all).
+
+f() ->
+    ok.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/ebin/z.app b/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/ebin/z.app
new file mode 100644
index 0000000000..437a0968e9
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/ebin/z.app
@@ -0,0 +1,7 @@
+% -*-erlang-*-
+{application, z,
+ [{description, "Library application in reltool dependency test"},
+  {vsn, "1.0"},
+  {modules, [z1]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/src/z1.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/src/z1.erl
new file mode 100644
index 0000000000..97ef90b87f
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/z-1.0/src/z1.erl
@@ -0,0 +1,5 @@
+-module(z1).
+-compile(export_all).
+
+f() ->
+    ok.