diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-07-17 06:09:48 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-07-17 06:09:48 -0400 |
| commit | 0a4b43f6783f41bc464d4e55bc862fb6ee424292 (patch) | |
| tree | 40c09bf3148da7197d01bc6ed94d5108356ea998 /test/rebar_src_dirs_SUITE.erl | |
| parent | 88067b1b88e229290ff6e39e30ef680759de2e23 (diff) | |
| parent | 6f95911d3244c063222b4b4bcbb6c2e2271c5f4d (diff) | |
Merge pull request #619 from tsloughter/app_find
only look for top level apps and those directly under apps/ or lib/
Diffstat (limited to 'test/rebar_src_dirs_SUITE.erl')
| -rw-r--r-- | test/rebar_src_dirs_SUITE.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/rebar_src_dirs_SUITE.erl b/test/rebar_src_dirs_SUITE.erl index 1804fbf..e322190 100644 --- a/test/rebar_src_dirs_SUITE.erl +++ b/test/rebar_src_dirs_SUITE.erl @@ -153,17 +153,17 @@ build_multi_apps(Config) -> Name1 = rebar_test_utils:create_random_name("app1_"), Vsn1 = rebar_test_utils:create_random_vsn(), - rebar_test_utils:create_app(filename:join([AppDir,Name1]), Name1, Vsn1, [kernel, stdlib]), + rebar_test_utils:create_app(filename:join([AppDir,"apps",Name1]), Name1, Vsn1, [kernel, stdlib]), Name2 = rebar_test_utils:create_random_name("app2_"), Vsn2 = rebar_test_utils:create_random_vsn(), - rebar_test_utils:create_app(filename:join([AppDir,Name2]), Name2, Vsn2, [kernel, stdlib]), + rebar_test_utils:create_app(filename:join([AppDir,"apps",Name2]), Name2, Vsn2, [kernel, stdlib]), - Extra1 = filename:join([AppDir, Name1, "extra", "extra1.erl"]), + Extra1 = filename:join([AppDir, "apps", Name1, "extra", "extra1.erl"]), ok = filelib:ensure_dir(Extra1), Src1 = io_lib:format("-module(extra1).~n-export([x/0]).~nx() -> ok.", []), ok = ec_file:write(Extra1, Src1), - Extra2 = filename:join([AppDir, Name2, "extra", "extra2.erl"]), + Extra2 = filename:join([AppDir, "apps", Name2, "extra", "extra2.erl"]), ok = filelib:ensure_dir(Extra2), Src2 = io_lib:format("-module(extra2).~n-export([x/0]).~nx() -> ok.", []), ok = ec_file:write(Extra2, Src2), @@ -178,7 +178,7 @@ build_multi_apps(Config) -> %% check that `extraX.erl` was compiled to the `ebin` dir Ebin1 = filename:join([AppDir, "_build", "default", "lib", Name1, "ebin"]), true = filelib:is_file(filename:join([Ebin1, "extra1.beam"])), - + Ebin2 = filename:join([AppDir, "_build", "default", "lib", Name2, "ebin"]), true = filelib:is_file(filename:join([Ebin2, "extra2.beam"])), @@ -236,4 +236,4 @@ src_dir_takes_precedence_over_extra(Config) -> Name ++ ".app"])), [{application, _, KVs}] = App, Mods = proplists:get_value(modules, KVs), - true = lists:member(extra, Mods).
\ No newline at end of file + true = lists:member(extra, Mods). |