[reltool] Allow incl_cond=derived on module level

According to documentation it should be allowed to set
incl_cond=include|exclude|derived, but if set to derived on module
level, reltool_server would crash. This has been corrected.

5 files changed, 58 insertions, 6 deletions

diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml
index 2567a72999..d7d7e12566 100644
--- a/lib/reltool/doc/src/reltool.xml
+++ b/lib/reltool/doc/src/reltool.xml
@@ -446,7 +446,7 @@
       <tag><c>incl_cond</c></tag>
       <item>
         <p>This parameter controls whether the module is included or not. By
-        default the <c>mod_incl</c> parameter on application and system level
+        default the <c>mod_cond</c> parameter on application and system level
         will be used to control whether the module is included or not. The
         value of <c>incl_cond</c> overrides the module inclusion policy.
         <c>include</c> implies that the module is included, while
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index 3d1d7e54bf..3b5b2ff81c 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -674,6 +674,8 @@ mod_init_is_included(ModTab, M, ModCond, AppCond, Default, Status) ->
                         true;
                     exclude ->
                         false;
+		    derived ->
+			undefined;
                     undefined ->
                         %% print(M#mod.name, hipe, "mod_cond -> ~p\n",
 			%%       [ModCond]),
@@ -693,6 +695,8 @@ mod_init_is_included(ModTab, M, ModCond, AppCond, Default, Status) ->
                         true;
                     exclude ->
                         false;
+		    derived ->
+			undefined;
                     undefined ->
                         Default
                 end
@@ -783,9 +787,10 @@ mod_mark_is_included(#state{app_tab=AppTab, mod_tab=ModTab, sys=Sys} = S,
                                     M#mod{is_pre_included = true,
 					  is_included = true};
                                 exclude ->
-                                    M#mod{is_pre_included = true,
-					  is_included = true};
-                                undefined ->
+                                    M#mod{is_pre_included = false,
+					  is_included = false};
+				ModInclCond when ModInclCond==undefined;
+						 ModInclCond==derived  ->
                                     M#mod{is_included = true}
                             end,
                         ets:insert(ModTab, M2),
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index f29f6049a5..36d26bec68 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -90,6 +90,7 @@ all() ->
      gen_rel_files,
      save_config,
      dependencies,
+     mod_incl_cond_derived,
      use_selected_vsn,
      use_selected_vsn_relative_path].
 
@@ -1942,7 +1943,7 @@ save_config(Config) ->
 %%
 %% x-1.0: x1.erl   x2.erl   x3.erl
 %%                   \        /         (x2 calls y1, x3 calls y2)
-%% y-1.0:          y1.erl   y2.erl
+%% y-1.0: y0.erl    y1.erl   y2.erl
 %%                    \                 (y1 calls z1)
 %% z-1.0            z1.erl
 %%
@@ -2072,6 +2073,47 @@ dependencies(Config) ->
     ok.
 
 
+%% Test that incl_cond on mod level overwrites mod_cond on app level
+%% Uses same test applications as dependencies/1 above
+mod_incl_cond_derived(Config) ->
+    %% In app y: mod_cond=none means no module shall be included
+    %% but mod_cond is overwritten by incl_cond on mod level
+    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,include},
+			{mod_cond,none},
+			{mod,y0,[{incl_cond,derived}]},
+			{mod,y2,[{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]},
+	       #app{name=y,uses_apps=[]}]},
+	  reltool_server:get_apps(Pid,whitelist)),
+    {ok, Der} = ?msym({ok,_},reltool_server:get_apps(Pid,derived)),
+    ?msym([], rm_missing_app(Der)),
+    ?msym({ok,[]}, reltool_server:get_apps(Pid,source)),
+
+    %% 1. check that y0 is not included since it has
+    %% incl_cond=derived, but is not used by any other module.
+    ?msym({ok,#mod{is_included=undefined}}, reltool_server:get_mod(Pid,y0)),
+
+    %% 2. check that y1 is excluded since it has undefined incl_cond
+    %% on mod level, so mod_cond on app level shall be used.
+    ?msym({ok,#mod{is_included=false}}, reltool_server:get_mod(Pid,y1)),
+
+    %% 3. check that y2 is included since it has incl_cond=derived and
+    %% is used by x3.
+    ?msym({ok,#mod{is_included=true}}, reltool_server:get_mod(Pid,y2)),
+
+    ok.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 use_selected_vsn(Config) ->
     LibDir1 = filename:join(datadir(Config),"use_selected_vsn"),
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
index d9dac371d7..39fdabeea4 100644
--- 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
@@ -2,6 +2,6 @@
 {application, y,
  [{description, "Library application in reltool dependency test"},
   {vsn, "1.0"},
-  {modules, [y1,y2]},
+  {modules, [y0,y1,y2]},
   {registered, []},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y0.erl b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y0.erl
new file mode 100644
index 0000000000..dc188ba7b6
--- /dev/null
+++ b/lib/reltool/test/reltool_server_SUITE_data/dependencies/y-1.0/src/y0.erl
@@ -0,0 +1,5 @@
+-module(y0).
+-compile(export_all).
+
+f() ->
+    ok.