From 4e863bd88520be1a786026eeb861cb70d00e7b01 Mon Sep 17 00:00:00 2001
From: Eric B Merritt <ericbmerritt@gmail.com>
Date: Tue, 9 Apr 2013 16:40:29 -0700
Subject: fixes #29 - look for common sub dirs for discovery

With this change relcool looks for the common sub directories to add
to the search. Those directories are now, relative to the project dir,
`apps`, `lib`, `ebin`, and the release output dir.

These automatic subdirs can be disabled by setting
`disable_project_subdirs` to `true` in the config.

The release output dir is also added to the discovery process. This
can be disabled by setting `disable_discover_release_output` to true.
---
 test/rclt_command_SUITE.erl  | 4 ++--
 test/rclt_discover_SUITE.erl | 9 ++++-----
 test/rclt_release_SUITE.erl  | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'test')

diff --git a/test/rclt_command_SUITE.erl b/test/rclt_command_SUITE.erl
index 3d06dad..9c96005 100644
--- a/test/rclt_command_SUITE.erl
+++ b/test/rclt_command_SUITE.erl
@@ -45,8 +45,8 @@ all() ->
 
 normal_passing_case(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
-    Lib1 = filename:join([DataDir, "lib1"]),
-    Lib2 = filename:join([DataDir, "lib2"]),
+    Lib1 = filename:join([DataDir, <<"lib1">>]),
+    Lib2 = filename:join([DataDir, <<"lib2">>]),
     Outdir = filename:join([DataDir, "outdir"]),
     ok = rcl_util:mkdir_p(Lib1),
     ok = rcl_util:mkdir_p(Lib2),
diff --git a/test/rclt_discover_SUITE.erl b/test/rclt_discover_SUITE.erl
index 4b6cb2a..e3a2861 100644
--- a/test/rclt_discover_SUITE.erl
+++ b/test/rclt_discover_SUITE.erl
@@ -111,7 +111,7 @@ no_beam_case(Config) ->
     write_app_file(AppDir, BadName, BadVsn),
     State0 = proplists:get_value(state, Config),
     {DiscoverProvider, {ok, State1}} = rcl_provider:new(rcl_prv_discover, State0),
-    EbinDir = filename:join([LibDir2, BadName, "ebin"]),
+    EbinDir = filename:join([LibDir2, BadName, <<"ebin">>]),
     ?assertMatch({error, {_, [{no_beam_files, EbinDir}]}},
                  rcl_provider:do(DiscoverProvider, State1)).
 
@@ -135,14 +135,12 @@ bad_ebin_case(Config) ->
     BadName = create_random_name("error_bad"),
     BadVsn = create_random_vsn(),
     AppDir = filename:join([LibDir2, BadName]),
-    Filename = filename:join([AppDir,  "ebin", BadName ++ ".app"]),
-    io:format("BAD -> ~p~n", [Filename]),
+    Filename = filename:join([AppDir,  <<"ebin">>, BadName ++ ".app"]),
     ok = filelib:ensure_dir(Filename),
     ok = ec_file:write_term(Filename, get_bad_app_metadata(BadName, BadVsn)),
     write_beam_file(AppDir, BadName),
     State0 = proplists:get_value(state, Config),
     {DiscoverProvider, {ok, State1}} = rcl_provider:new(rcl_prv_discover, State0),
-
     ?assertMatch({error, {_, [{invalid_app_file, Filename}]}},
                  rcl_provider:do(DiscoverProvider, State1)).
 
@@ -154,7 +152,8 @@ create_app(Dir, Name, Vsn) ->
     AppDir = filename:join([Dir, Name]),
     write_app_file(AppDir, Name, Vsn),
     write_beam_file(AppDir, Name),
-    {ok, App} = rcl_app_info:new(erlang:list_to_atom(Name), Vsn, AppDir,
+    {ok, App} = rcl_app_info:new(erlang:list_to_atom(Name), Vsn,
+                                 erlang:iolist_to_binary(AppDir),
                                  [kernel, stdlib], []),
     App.
 
diff --git a/test/rclt_release_SUITE.erl b/test/rclt_release_SUITE.erl
index fccdfcc..c774619 100644
--- a/test/rclt_release_SUITE.erl
+++ b/test/rclt_release_SUITE.erl
@@ -290,7 +290,7 @@ make_rerun_overridden_release(Config) ->
     OutputDir = filename:join([proplists:get_value(data_dir, Config),
                                create_random_name("relcool-output")]),
     {ok, Cwd} = file:get_cwd(),
-    {ok, State} = relcool:do(Cwd, undefined, undefined, [], [LibDir1], 2,
+    {ok, _} = relcool:do(Cwd, undefined, undefined, [], [LibDir1], 2,
                              OutputDir, [{OverrideAppName, OverrideAppDir}],
                              ConfigFile),
 
-- 
cgit v1.2.3