diff options
author | Fred Hebert <mononcqc@ferd.ca> | 2017-09-27 19:01:44 -0400 |
---|---|---|
committer | Fred Hebert <mononcqc@ferd.ca> | 2017-09-27 19:21:37 -0400 |
commit | cf83eb7fc45fac677a83b5f38e87c581cf516cf2 (patch) | |
tree | a01cef1a8c93e6a1c5d72d89a8f5ac6a82bbc0cb /test | |
parent | c3f01c60139977dfad4723748e7c2f493fffd0ae (diff) |
Corrects a fix to src_dir values
The previous patch at #7c959cc fixed the usage of duplicate values
for directories through relative paths, but mistakenly went overboard
and dropped the `./` path, which is still fairly common. Similarly for
`../".
The code is modified to special-case such values and keep the code
working.
Diffstat (limited to 'test')
-rw-r--r-- | test/rebar_dir_SUITE.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/rebar_dir_SUITE.erl b/test/rebar_dir_SUITE.erl index 3b8e1fc..4743865 100644 --- a/test/rebar_dir_SUITE.erl +++ b/test/rebar_dir_SUITE.erl @@ -68,10 +68,11 @@ default_all_src_dirs(Config) -> ["src", "test"] = rebar_dir:all_src_dirs(rebar_state:opts(State), ["src"], ["test"]). src_dirs(Config) -> - RebarConfig = [{erl_opts, [{src_dirs, ["foo", "./bar", "bar", "bar/", "./bar/", "baz"]}]}], + RebarConfig = [{erl_opts, [{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)). + [".", "..", "../..", "bar", "baz", "foo"] = rebar_dir:src_dirs(rebar_state:opts(State)). src_dirs_with_opts(Config) -> RebarConfig = [{erl_opts, [{src_dirs, ["foo", "bar", "baz"]}, |