From b757069c9ed0ddce0d74d11242029cf6bbf551a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kan=20Mattsson?= <hm@tail-f.com>
Date: Mon, 18 Mar 2013 18:24:14 +0100
Subject: [reltool] Relax requirements on excluded applications

A missing application directory is now classified as a warning if the
application is explicitly excluded.
---
 lib/reltool/test/reltool_server_SUITE.erl | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'lib/reltool/test')

diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index 23338d9ecd..a667de5969 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -80,6 +80,7 @@ all() ->
      otp_9229_dupl_mod_exclude_app,
      otp_9229_dupl_mod_exclude_mod,
      dupl_mod_in_app_file,
+     exclude_non_existing_app,
      get_apps,
      get_mod,
      get_sys,
@@ -1313,7 +1314,6 @@ otp_9229_dupl_mod_exclude_mod(Config) ->
 
     ok.
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Test that if a module is duplicated in a .app file, then a warning
 %% is produced, but target can still be created.
@@ -1345,6 +1345,31 @@ dupl_mod_in_app_file(Config) ->
 
     ok.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Test that if an application is explicitly excluded a warning should
+%% be issued.
+exclude_non_existing_app(_Config) ->
+    %% Configure the server
+    Sys =
+        {sys,
+         [
+          {incl_cond,exclude},
+          {app,foobar,[{incl_cond,exclude}]},
+          {app,kernel,[{incl_cond,include}]},
+          {app,stdlib,[{incl_cond,include}]},
+          {app,sasl,[{incl_cond,include}]}
+         ]},
+
+    %% Generate target file
+    TargetDir = filename:join([?WORK_DIR, "target_exclude_non_existing_app"]),
+    ?m(ok, reltool_utils:recursive_delete(TargetDir)),
+    ?m(ok, file:make_dir(TargetDir)),
+    ?log("SPEC: ~p\n", [reltool:get_target_spec([{config, Sys}])]),
+    ?m({ok,["foobar: Missing application directory."]},
+       reltool:get_status([{config, Sys}])),
+
+    ok.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Test the interface used by the GUI:
 %%  get_app
-- 
cgit v1.2.3