summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2018-04-23 13:38:37 -0400
committerFred Hebert <mononcqc@ferd.ca>2018-04-23 13:38:37 -0400
commit288d0c7484ba9214cc6598100000bcce0fefe462 (patch)
treed25f1f9aa15e596f147e69dab428e3d1f828e598
parent35fb67523d784927a291fb464da4b36c6004470c (diff)
Clear all dialyzer errors
- this is done by adding a HiPE dependency - also in this: adding a test for directories, and fixing some indent
-rw-r--r--src/rebar.app.src1
-rw-r--r--src/rebar_string.erl2
-rw-r--r--test/rebar_dir_SUITE.erl12
3 files changed, 13 insertions, 2 deletions
diff --git a/src/rebar.app.src b/src/rebar.app.src
index 43ad620..c96f65c 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -8,6 +8,7 @@
{registered, []},
{applications, [kernel,
stdlib,
+ hipe,
sasl,
compiler,
crypto,
diff --git a/src/rebar_string.erl b/src/rebar_string.erl
index c1858f9..47cb15c 100644
--- a/src/rebar_string.erl
+++ b/src/rebar_string.erl
@@ -11,7 +11,7 @@
%% used. Instead we just adopt join/2 locally and hope it works
%% for most unicode use cases anyway.
join([], Sep) when is_list(Sep) ->
- [];
+ [];
join([H|T], Sep) ->
H ++ lists:append([Sep ++ X || X <- T]).
diff --git a/test/rebar_dir_SUITE.erl b/test/rebar_dir_SUITE.erl
index 4743865..0eda5bf 100644
--- a/test/rebar_dir_SUITE.erl
+++ b/test/rebar_dir_SUITE.erl
@@ -5,6 +5,7 @@
-export([default_src_dirs/1, default_extra_src_dirs/1, default_all_src_dirs/1]).
-export([src_dirs/1, src_dirs_with_opts/1, extra_src_dirs/1, all_src_dirs/1]).
-export([src_dir_opts/1, recursive/1]).
+-export([top_src_dirs/1]).
-export([profile_src_dirs/1, profile_extra_src_dirs/1, profile_all_src_dirs/1]).
-export([profile_src_dir_opts/1]).
-export([retarget_path/1, alt_base_dir_abs/1, alt_base_dir_rel/1]).
@@ -18,7 +19,7 @@
all() -> [default_src_dirs, default_extra_src_dirs, default_all_src_dirs,
src_dirs, extra_src_dirs, all_src_dirs, src_dir_opts, recursive,
profile_src_dirs, profile_extra_src_dirs, profile_all_src_dirs,
- profile_src_dir_opts,
+ profile_src_dir_opts, top_src_dirs,
retarget_path, alt_base_dir_abs, alt_base_dir_rel, global_cache_dir,
default_global_cache_dir, overwrite_default_global_cache_dir].
@@ -123,6 +124,15 @@ recursive(Config) ->
ok.
+top_src_dirs(Config) ->
+ %% We can get the same result out of specifying src_dirs from the config root,
+ %% not just the erl_opts
+ RebarConfig = [{src_dirs, ["foo", "./bar", "bar", "bar/", "./bar/", "baz",
+ "./", ".", "../", "..", "./../", "../.", ".././../"]}],
+ {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return),
+
+ [".", "..", "../..", "bar", "baz", "foo"] = rebar_dir:src_dirs(rebar_state:opts(State)).
+
profile_src_dirs(Config) ->
RebarConfig = [
{erl_opts, [{src_dirs, ["foo", "bar"]}]},