Merge pull request #883 from talentdeficit/erlc_compiler_refactor

compiler refactor/eunit & ct fixes

7 files changed, 679 insertions, 123 deletions

diff --git a/test/rebar_compile_SUITE.erl b/test/rebar_compile_SUITE.erl
index 561e657..1c2c527 100644
--- a/test/rebar_compile_SUITE.erl
+++ b/test/rebar_compile_SUITE.erl
@@ -5,12 +5,23 @@
          end_per_suite/1,
          init_per_testcase/2,
          end_per_testcase/2,
+         init_per_group/2,
+         end_per_group/2,
          all/0,
-         build_basic_app/1,
-         build_release_apps/1,
-         build_checkout_apps/1,
-         build_checkout_deps/1,
-         build_all_srcdirs/1,
+         groups/0,
+         build_basic_app/1, paths_basic_app/1, clean_basic_app/1,
+         build_release_apps/1, paths_release_apps/1, clean_release_apps/1,
+         build_checkout_apps/1, paths_checkout_apps/1,
+         build_checkout_deps/1, paths_checkout_deps/1,
+         build_basic_srcdirs/1, paths_basic_srcdirs/1,
+         build_release_srcdirs/1, paths_release_srcdirs/1,
+         build_unbalanced_srcdirs/1, paths_unbalanced_srcdirs/1,
+         build_basic_extra_dirs/1, paths_basic_extra_dirs/1, clean_basic_extra_dirs/1,
+         build_release_extra_dirs/1, paths_release_extra_dirs/1, clean_release_extra_dirs/1,
+         build_unbalanced_extra_dirs/1, paths_unbalanced_extra_dirs/1,
+         build_extra_dirs_in_project_root/1,
+         paths_extra_dirs_in_project_root/1,
+         clean_extra_dirs_in_project_root/1,
          recompile_when_hrl_changes/1,
          recompile_when_opts_change/1,
          dont_recompile_when_opts_dont_change/1,
@@ -26,8 +37,7 @@
          only_default_transitive_deps/1,
          clean_all/1,
          override_deps/1,
-         profile_override_deps/1,
-         build_more_sources/1]).
+         profile_override_deps/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -36,116 +46,590 @@
 suite() ->
     [].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_testcase(_, Config) ->
-    rebar_test_utils:init_rebar_state(Config).
-
-end_per_testcase(_, _Config) ->
-    catch meck:unload().
-
 all() ->
-    [build_basic_app, build_release_apps,
-     build_checkout_apps, build_checkout_deps,
-     build_all_srcdirs, recompile_when_hrl_changes,
-     recompile_when_opts_change, dont_recompile_when_opts_dont_change,
-     dont_recompile_yrl_or_xrl, delete_beam_if_source_deleted,
+    [{group, basic_app}, {group, release_apps},
+     {group, checkout_apps}, {group, checkout_deps},
+     {group, basic_srcdirs}, {group, release_srcdirs}, {group, unbalanced_srcdirs},
+     {group, basic_extras}, {group, release_extras}, {group, unbalanced_extras},
+     {group, root_extras},
+     recompile_when_hrl_changes, recompile_when_opts_change,
+     dont_recompile_when_opts_dont_change, dont_recompile_yrl_or_xrl,
+     delete_beam_if_source_deleted,
      deps_in_path, checkout_priority, highest_version_of_pkg_dep,
      parse_transform_test, erl_first_files_test, mib_test,
      umbrella_mib_first_test, only_default_transitive_deps,
-     clean_all, override_deps, profile_override_deps, build_more_sources].
-
-build_basic_app(Config) ->
-    AppDir = ?config(apps, Config),
-
-    Name = rebar_test_utils:create_random_name("app1_"),
+     clean_all, override_deps, profile_override_deps].
+
+groups() ->
+    [{basic_app, [], [build_basic_app, paths_basic_app, clean_basic_app]},
+     {release_apps, [], [build_release_apps, paths_release_apps, clean_release_apps]},
+     {checkout_apps, [], [build_checkout_apps, paths_checkout_apps]},
+     {checkout_deps, [], [build_checkout_deps, paths_checkout_deps]},
+     {basic_srcdirs, [], [build_basic_srcdirs, paths_basic_srcdirs]},
+     {release_srcdirs, [], [build_release_srcdirs,
+                            paths_release_srcdirs]},
+     {unbalanced_srcdirs, [], [build_unbalanced_srcdirs,
+                               paths_unbalanced_srcdirs]},
+     {basic_extras, [], [build_basic_extra_dirs,
+                         paths_basic_extra_dirs,
+                         clean_basic_extra_dirs]},
+     {release_extras, [], [build_release_extra_dirs,
+                           paths_release_extra_dirs,
+                           clean_release_extra_dirs]},
+     {unbalanced_extras, [], [build_unbalanced_extra_dirs,
+                              paths_unbalanced_extra_dirs]},
+     {root_extras, [], [build_extra_dirs_in_project_root,
+                        paths_extra_dirs_in_project_root,
+                        clean_extra_dirs_in_project_root]}].
+
+init_per_group(basic_app, Config) ->
+    NewConfig = rebar_test_utils:init_rebar_state(Config, "basic_app_"),
+    AppDir = ?config(apps, NewConfig),
+
+    Name = rebar_test_utils:create_random_name("app1"),
     Vsn = rebar_test_utils:create_random_vsn(),
     rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]),
+    
+    [{app_names, [Name]}, {vsns, [Vsn]}|NewConfig];
 
-    rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name}]}).
-
-build_release_apps(Config) ->
-    AppDir = ?config(apps, Config),
+init_per_group(release_apps, Config) ->
+    NewConfig = rebar_test_utils:init_rebar_state(Config, "release_apps_"),
+    AppDir = ?config(apps, NewConfig),
 
     Name1 = rebar_test_utils:create_random_name("relapp1_"),
     Vsn1 = rebar_test_utils:create_random_vsn(),
     rebar_test_utils:create_app(filename:join([AppDir,"apps",Name1]), Name1, Vsn1, [kernel, stdlib]),
+
     Name2 = rebar_test_utils:create_random_name("relapp2_"),
     Vsn2 = rebar_test_utils:create_random_vsn(),
     rebar_test_utils:create_app(filename:join([AppDir,"apps",Name2]), Name2, Vsn2, [kernel, stdlib]),
+    
+    [{app_names, [Name1, Name2]}, {vsns, [Vsn1, Vsn2]}|NewConfig];
 
-    rebar_test_utils:run_and_check(
-        Config, [], ["compile"],
-        {ok, [{app, Name1}, {app, Name2}]}
-    ).
+init_per_group(checkout_apps, Config) ->
+    NewConfig = rebar_test_utils:init_rebar_state(Config, "checkout_apps_"),
+    AppDir = ?config(apps, NewConfig),
+    CheckoutsDir = ?config(checkouts, NewConfig),
 
-build_checkout_apps(Config) ->
-    AppDir = ?config(apps, Config),
-    CheckoutsDir = ?config(checkouts, Config),
     Name1 = rebar_test_utils:create_random_name("checkapp1_"),
     Vsn1 = rebar_test_utils:create_random_vsn(),
     rebar_test_utils:create_app(AppDir, Name1, Vsn1, [kernel, stdlib]),
+
     Name2 = rebar_test_utils:create_random_name("checkapp2_"),
     Vsn2 = rebar_test_utils:create_random_vsn(),
     rebar_test_utils:create_app(filename:join([CheckoutsDir,Name2]), Name2, Vsn2, [kernel, stdlib]),
 
-    rebar_test_utils:run_and_check(
-        Config, [], ["compile"],
-        {ok, [{app, Name1}, {checkout, Name2}]}
-    ).
+    [{app_names, [Name1, Name2]}, {vsns, [Vsn1, Vsn2]}|NewConfig];
 
-build_checkout_deps(Config) ->
-    AppDir = ?config(apps, Config),
-    CheckoutsDir = ?config(checkouts, Config),
+init_per_group(checkout_deps, Config) ->
+    NewConfig = rebar_test_utils:init_rebar_state(Config, "checkout_deps_"),
+    AppDir = ?config(apps, NewConfig),
+    CheckoutsDir = ?config(checkouts, NewConfig),
     DepsDir = filename:join([AppDir, "_build", "default", "lib"]),
+
     Name1 = rebar_test_utils:create_random_name("checkapp1_"),
     Vsn1 = rebar_test_utils:create_random_vsn(),
     rebar_test_utils:create_app(AppDir, Name1, Vsn1, [kernel, stdlib]),
+
     Name2 = rebar_test_utils:create_random_name("checkapp2_"),
     Vsn2 = rebar_test_utils:create_random_vsn(),
     rebar_test_utils:create_app(filename:join([CheckoutsDir,Name2]), Name2, Vsn2, [kernel, stdlib]),
+
     rebar_test_utils:create_app(filename:join([DepsDir,Name2]), Name2, Vsn1, [kernel, stdlib]),
 
+    [{app_names, [Name1, Name2]}, {vsns, [Vsn1, Vsn2]}|NewConfig];
+
+init_per_group(Group, Config) when Group == basic_srcdirs; Group == basic_extras ->
+    NewConfig = rebar_test_utils:init_rebar_state(Config, "basic_srcdirs_"),
+    AppDir = ?config(apps, NewConfig),
+
+    Name = rebar_test_utils:create_random_name("app1_"),
+    Vsn = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]),
+
+    ExtraSrc = io_lib:format("-module(~ts_extra).\n-export([ok/0]).\nok() -> ok.\n", [Name]),
+
+    ok = filelib:ensure_dir(filename:join([AppDir, "extra", "dummy"])),
+    ok = file:write_file(filename:join([AppDir, "extra", io_lib:format("~ts_extra.erl", [Name])]),
+                         ExtraSrc),
+
+    [{app_names, [Name]}, {vsns, [Vsn]}|NewConfig];
+
+init_per_group(Group, Config) when Group == release_srcdirs; Group == release_extras ->
+    NewConfig = rebar_test_utils:init_rebar_state(Config, "release_srcdirs_"),
+    AppDir = ?config(apps, NewConfig),
+
+    Name1 = rebar_test_utils:create_random_name("relapp1_"),
+    Vsn1 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name1]), Name1, Vsn1, [kernel, stdlib]),
+
+    Name2 = rebar_test_utils:create_random_name("relapp2_"),
+    Vsn2 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name2]), Name2, Vsn2, [kernel, stdlib]),
+
+    ExtraOne = io_lib:format("-module(~ts_extra).\n-export([ok/0]).\nok() -> ok.\n", [Name1]),
+
+    ok = filelib:ensure_dir(filename:join([AppDir, "apps", Name1, "extra", "dummy"])),
+    ok = file:write_file(filename:join([AppDir, "apps", Name1, "extra",
+                                        io_lib:format("~ts_extra.erl", [Name1])]),
+                         ExtraOne),
+
+    ExtraTwo = io_lib:format("-module(~ts_extra).\n-export([ok/0]).\nok() -> ok.\n", [Name2]),
+
+    ok = filelib:ensure_dir(filename:join([AppDir, "apps", Name2, "extra", "dummy"])),
+    ok = file:write_file(filename:join([AppDir, "apps", Name2, "extra",
+                                        io_lib:format("~ts_extra.erl", [Name2])]),
+                         ExtraTwo),
+
+    [{app_names, [Name1, Name2]}, {vsns, [Vsn1, Vsn2]}|NewConfig];
+
+init_per_group(Group, Config) when Group == unbalanced_srcdirs; Group == unbalanced_extras ->
+    NewConfig = rebar_test_utils:init_rebar_state(Config, "unbalanced_srcdirs_"),
+    AppDir = ?config(apps, NewConfig),
+
+    Name1 = rebar_test_utils:create_random_name("relapp1_"),
+    Vsn1 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name1]), Name1, Vsn1, [kernel, stdlib]),
+
+    Name2 = rebar_test_utils:create_random_name("relapp2_"),
+    Vsn2 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name2]), Name2, Vsn2, [kernel, stdlib]),
+
+    ExtraOne = io_lib:format("-module(~ts_extra).\n-export([ok/0]).\nok() -> ok.\n", [Name1]),
+
+    ok = filelib:ensure_dir(filename:join([AppDir, "apps", Name1, "extra", "dummy"])),
+    ok = file:write_file(filename:join([AppDir, "apps", Name1, "extra",
+                                        io_lib:format("~ts_extra.erl", [Name1])]),
+                         ExtraOne),
+
+    [{app_names, [Name1, Name2]}, {vsns, [Vsn1, Vsn2]}|NewConfig];
+
+init_per_group(root_extras, Config) ->
+    NewConfig = rebar_test_utils:init_rebar_state(Config, "root_extras_"),
+    AppDir = ?config(apps, NewConfig),
+
+    Name1 = rebar_test_utils:create_random_name("relapp1_"),
+    Vsn1 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name1]), Name1, Vsn1, [kernel, stdlib]),
+
+    Name2 = rebar_test_utils:create_random_name("relapp2_"),
+    Vsn2 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name2]), Name2, Vsn2, [kernel, stdlib]),
+
+    Extra = <<"-module(extra).\n-export([ok/0]).\nok() -> ok.\n">>,
+
+    ok = filelib:ensure_dir(filename:join([AppDir, "extra", "dummy"])),
+    ok = file:write_file(filename:join([AppDir, "extra", "extra.erl"]), Extra),
+
+    [{app_names, [Name1, Name2]}, {vsns, [Vsn1, Vsn2]}|NewConfig].
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_, Config) ->
+    case ?config(apps, Config) of
+        undefined -> rebar_test_utils:init_rebar_state(Config);
+        _         -> Config
+    end.
+
+end_per_testcase(_, _Config) ->
+    catch meck:unload().
+
+
+
+%% test cases
+
+build_basic_app(Config) ->
+    [Name] = ?config(app_names, Config),
+    rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name}]}).
+
+build_release_apps(Config) ->
+    [Name1, Name2] = ?config(app_names, Config),
+    rebar_test_utils:run_and_check(
+        Config, [], ["compile"],
+        {ok, [{app, Name1}, {app, Name2}]}
+    ).
+
+build_checkout_apps(Config) ->
+    [Name1, Name2] = ?config(app_names, Config),
+    rebar_test_utils:run_and_check(
+        Config, [], ["compile"],
+        {ok, [{app, Name1}, {checkout, Name2}]}
+    ).
+
+build_checkout_deps(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+    [_, Vsn2] = ?config(vsns, Config),
+
     Deps = [{list_to_atom(Name2), Vsn2, {git, "", ""}}],
     {ok, RebarConfig} = file:consult(rebar_test_utils:create_config(AppDir, [{deps, Deps}])),
 
-    {ok, State} = rebar_test_utils:run_and_check(
+    rebar_test_utils:run_and_check(
         Config, RebarConfig, ["compile"],
         {ok, [{app, Name1}, {checkout, Name2}]}
+    ).
+
+build_basic_srcdirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{src_dirs, ["src", "extra"]}]}],
+
+    %% check a beam corresponding to the src in the extra src_dir exists
+    ExtraBeam = filename:join([AppDir, "_build", "default", "lib", Name, "ebin",
+                               io_lib:format("~ts_extra.beam", [Name])]),
+    %% check the extra src_dir was copied/linked into the _build dir
+    ExtraDir = filename:join([AppDir, "_build", "default", "lib", Name, "extra"]),
+
+    rebar_test_utils:run_and_check(
+        Config, RebarConfig, ["compile"],
+        {ok, [{app, Name}, {file, ExtraBeam}, {dir, ExtraDir}]}
+    ).
+
+build_release_srcdirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{src_dirs, ["src", "extra"]}]}],
+
+    %% check a beam corresponding to the src in the extra src_dir exists
+    Extra1Beam = filename:join([AppDir, "_build", "default", "lib", Name1, "ebin",
+                                io_lib:format("~ts_extra.beam", [Name1])]),
+    Extra2Beam = filename:join([AppDir, "_build", "default", "lib", Name2, "ebin",
+                                io_lib:format("~ts_extra.beam", [Name2])]),
+
+    %% check the extra src_dir was copied/linked into the _build dir
+    Extra1Dir = filename:join([AppDir, "_build", "default", "lib", Name1, "extra"]),
+    Extra2Dir = filename:join([AppDir, "_build", "default", "lib", Name2, "extra"]),
+
+    rebar_test_utils:run_and_check(
+        Config, RebarConfig, ["compile"],
+        {ok, [{app, Name1}, {app, Name2},
+              {file, Extra1Beam}, {file, Extra2Beam},
+              {dir, Extra1Dir}, {dir, Extra2Dir}]}
+    ).
+
+build_unbalanced_srcdirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{src_dirs, ["src", "extra"]}]}],
+
+    %% check a beam corresponding to the src in the extra src_dir exists
+    Extra1Beam = filename:join([AppDir, "_build", "default", "lib", Name1, "ebin",
+                                io_lib:format("~ts_extra.beam", [Name1])]),
+
+    %% check the extra src_dir was copied/linked into the _build dir
+    Extra1Dir = filename:join([AppDir, "_build", "default", "lib", Name1, "extra"]),
+
+    rebar_test_utils:run_and_check(
+        Config, RebarConfig, ["compile"],
+        {ok, [{app, Name1}, {app, Name2}, {file, Extra1Beam}, {dir, Extra1Dir}]}
     ),
+
+    %% check no extra src_dir were copied/linked into the _build dir
+    Extra2Dir = filename:join([AppDir, "_build", "default", "lib", Name2, "extra"]),
+    false = filelib:is_dir(Extra2Dir),
+    %% check only expected beams are in the ebin dir
+    {ok, Files} = rebar_utils:list_dir(filename:join([AppDir, "_build", "default", "lib", Name2, "ebin"])),
+    lists:all(fun(Beam) -> lists:member(Beam, [Name2 ++ ".app", "not_a_real_src_" ++ Name2 ++ ".beam"]) end,
+              Files).
+
+build_basic_extra_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{extra_src_dirs, ["extra"]}]}],
+
+    %% check a beam corresponding to the src in the extra src_dir exists
+    ExtraBeam = filename:join([AppDir, "_build", "default", "lib", Name, "extra",
+                               io_lib:format("~ts_extra.beam", [Name])]),
+
+    rebar_test_utils:run_and_check(
+        Config, RebarConfig, ["compile"],
+        {ok, [{app, Name}, {file, ExtraBeam}]}
+    ).
+
+build_release_extra_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{extra_src_dirs, ["extra"]}]}],
+
+    %% check a beam corresponding to the src in the extra src_dir exists
+    Extra1Beam = filename:join([AppDir, "_build", "default", "lib", Name1, "extra",
+                                io_lib:format("~ts_extra.beam", [Name1])]),
+    Extra2Beam = filename:join([AppDir, "_build", "default", "lib", Name2, "extra",
+                                io_lib:format("~ts_extra.beam", [Name2])]),
+
+    rebar_test_utils:run_and_check(
+        Config, RebarConfig, ["compile"],
+        {ok, [{app, Name1}, {app, Name2}, {file, Extra1Beam}, {file, Extra2Beam}]}
+    ).
+
+build_unbalanced_extra_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{extra_src_dirs, ["extra"]}]}],
+
+    %% check a beam corresponding to the src in the extra src_dir exists
+    Extra1Beam = filename:join([AppDir, "_build", "default", "lib", Name1, "extra",
+                                io_lib:format("~ts_extra.beam", [Name1])]),
+
+    rebar_test_utils:run_and_check(
+        Config, RebarConfig, ["compile"],
+        {ok, [{app, Name1}, {app, Name2}, {file, Extra1Beam}]}
+    ),
+
+    %% check no extra src_dir were copied/linked into the _build dir
+    false = filelib:is_dir(filename:join([AppDir, "_build", "default", "lib", Name2, "extra"])),
+    %% check only expected beams are in the ebin dir
+    {ok, Files} = rebar_utils:list_dir(filename:join([AppDir, "_build", "default", "lib", Name2, "ebin"])),
+    lists:all(fun(Beam) -> lists:member(Beam, [Name2 ++ ".app", "not_a_real_src_" ++ Name2 ++ ".beam"]) end,
+              Files).
+
+build_extra_dirs_in_project_root(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{extra_src_dirs, ["extra"]}]}],
+
+    %% check a beam corresponding to the src in the extra src_dir exists
+    ExtraBeam = filename:join([AppDir, "_build", "default", "extras", "extra", "extra.beam"]),
+
+    rebar_test_utils:run_and_check(
+        Config, RebarConfig, ["compile"],
+        {ok, [{app, Name1}, {app, Name2}, {file, ExtraBeam}]}
+    ).
+
+paths_basic_app(Config) ->
+    [Name] = ?config(app_names, Config),
+    [Vsn] = ?config(vsns, Config),
+
+    {ok, State} = rebar_test_utils:run_and_check(Config, [], ["compile"], return),
+    
+    code:add_paths(rebar_state:code_paths(State, all_deps)),
+    ok = application:load(list_to_atom(Name)),
+    Loaded = application:loaded_applications(),
+    {_, _, Vsn} = lists:keyfind(list_to_atom(Name), 1, Loaded).
+
+paths_release_apps(Config) ->
+    [Name1, Name2] = ?config(app_names, Config),
+    [Vsn1, Vsn2] = ?config(vsns, Config),
+
+    {ok, State} = rebar_test_utils:run_and_check(Config, [], ["compile"], return),
+
     code:add_paths(rebar_state:code_paths(State, all_deps)),
+    ok = application:load(list_to_atom(Name1)),
     ok = application:load(list_to_atom(Name2)),
     Loaded = application:loaded_applications(),
+    {_, _, Vsn1} = lists:keyfind(list_to_atom(Name1), 1, Loaded),
     {_, _, Vsn2} = lists:keyfind(list_to_atom(Name2), 1, Loaded).
 
-build_all_srcdirs(Config) ->
+paths_checkout_apps(Config) ->
+    [Name1, _Name2] = ?config(app_names, Config),
+    [Vsn1, _Vsn2] = ?config(vsns, Config),
+
+    {ok, State} = rebar_test_utils:run_and_check(Config, [], ["compile"], return),
+
+    code:add_paths(rebar_state:code_paths(State, all_deps)),
+    ok = application:load(list_to_atom(Name1)),
+    Loaded = application:loaded_applications(),
+    {_, _, Vsn1} = lists:keyfind(list_to_atom(Name1), 1, Loaded).
+
+paths_checkout_deps(Config) ->
     AppDir = ?config(apps, Config),
+    [_Name1, Name2] = ?config(app_names, Config),
+    [_Vsn1, Vsn2] = ?config(vsns, Config),
+
+    %% rebar_test_utils:init_rebar_state/1,2 uses rebar_state:new/3 which
+    %% maybe incorrectly sets deps to [] (based on `rebar.lock`) instead of
+    %% to the checkapps
+    %% until that is sorted out the lock file has to be removed before
+    %% this test will pass
+    file:delete(filename:join([AppDir, "rebar.lock"])),
+
+    {ok, RebarConfig} = file:consult(filename:join([AppDir, "rebar.config"])),
+
+    {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return),
+
+    code:add_paths(rebar_state:code_paths(State, all_deps)),
+    ok = application:load(list_to_atom(Name2)),
+    Loaded = application:loaded_applications(),
+    {_, _, Vsn2} = lists:keyfind(list_to_atom(Name2), 1, Loaded).
+
+paths_basic_srcdirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name] = ?config(app_names, Config),
 
     RebarConfig = [{erl_opts, [{src_dirs, ["src", "extra"]}]}],
 
-    Name = rebar_test_utils:create_random_name("app1_"),
-    Vsn = rebar_test_utils:create_random_vsn(),
-    rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]),
+    {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return),
 
-    ExtraSrc = <<"-module(extra_src).\n"
-        "-export([ok/0]).\n"
-        "ok() -> ok.\n">>,
+    code:add_paths(rebar_state:code_paths(State, all_deps)),
+    Mod = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name]))),
+    {module, Mod} = code:ensure_loaded(Mod),
 
-    ok = filelib:ensure_dir(filename:join([AppDir, "extra", "dummy"])),
-    ok = file:write_file(filename:join([AppDir, "extra", "extra_src.erl"]), ExtraSrc),
+    Expect = filename:join([AppDir, "_build", "default", "lib", Name, "ebin",
+                            io_lib:format("~ts_extra.beam", [Name])]),
+    Expect = code:which(Mod).
 
-    rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], {ok, [{app, Name}]}),
+paths_release_srcdirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
 
-    %% check a beam corresponding to the src in the extra src_dir exists in ebin
-    EbinDir = filename:join([AppDir, "_build", "default", "lib", Name, "ebin"]),
-    true = filelib:is_file(filename:join([EbinDir, "extra_src.beam"])),
+    RebarConfig = [{erl_opts, [{src_dirs, ["src", "extra"]}]}],
 
-    %% check the extra src_dir was linked into the _build dir
-    true = filelib:is_dir(filename:join([AppDir, "_build", "default", "lib", Name, "extra"])).
+    {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return),
+
+    code:add_paths(rebar_state:code_paths(State, all_deps)),
+    Mod1 = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name1]))),
+    {module, Mod1} = code:ensure_loaded(Mod1),
+    Mod2 = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name2]))),
+    {module, Mod2} = code:ensure_loaded(Mod2),
+
+    ExpectOne = filename:join([AppDir, "_build", "default", "lib", Name1, "ebin",
+                               io_lib:format("~ts_extra.beam", [Name1])]),
+    ExpectOne = code:which(Mod1),
+    ExpectTwo = filename:join([AppDir, "_build", "default", "lib", Name2, "ebin",
+                               io_lib:format("~ts_extra.beam", [Name2])]),
+    ExpectTwo = code:which(Mod2).
+
+paths_unbalanced_srcdirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{src_dirs, ["src", "extra"]}]}],
+
+    {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return),
+
+    code:add_paths(rebar_state:code_paths(State, all_deps)),
+    Mod1 = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name1]))),
+    {module, Mod1} = code:ensure_loaded(Mod1),
+    Mod2 = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name2]))),
+    {error, nofile} = code:ensure_loaded(Mod2),
+
+    ExpectOne = filename:join([AppDir, "_build", "default", "lib", Name1, "ebin",
+                               io_lib:format("~ts_extra.beam", [Name1])]),
+    ExpectOne = code:which(Mod1).
+
+paths_basic_extra_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{extra_src_dirs, ["extra"]}]}],
+
+    {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return),
+
+    code:add_paths(rebar_state:code_paths(State, all_deps)),
+    Mod = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name]))),
+    {module, Mod} = code:ensure_loaded(Mod),
+
+    Expect = filename:join([AppDir, "_build", "default", "lib", Name, "extra",
+                            io_lib:format("~ts_extra.beam", [Name])]),
+    Expect = code:which(Mod).
+
+paths_release_extra_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{extra_src_dirs, ["extra"]}]}],
+
+    {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return),
+
+    code:add_paths(rebar_state:code_paths(State, all_deps)),
+    Mod1 = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name1]))),
+    {module, Mod1} = code:ensure_loaded(Mod1),
+    Mod2 = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name2]))),
+    {module, Mod2} = code:ensure_loaded(Mod2),
+
+    ExpectOne = filename:join([AppDir, "_build", "default", "lib", Name1, "extra",
+                               io_lib:format("~ts_extra.beam", [Name1])]),
+    ExpectOne = code:which(Mod1),
+    ExpectTwo = filename:join([AppDir, "_build", "default", "lib", Name2, "extra",
+                               io_lib:format("~ts_extra.beam", [Name2])]),
+    ExpectTwo = code:which(Mod2).
+
+
+paths_unbalanced_extra_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+
+    RebarConfig = [{erl_opts, [{extra_src_dirs, ["extra"]}]}],
+
+    {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return),
+
+    code:add_paths(rebar_state:code_paths(State, all_deps)),
+    Mod1 = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name1]))),
+    {module, Mod1} = code:ensure_loaded(Mod1),
+    Mod2 = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name2]))),
+    {error, nofile} = code:ensure_loaded(Mod2),
+
+    ExpectOne = filename:join([AppDir, "_build", "default", "lib", Name1, "extra",
+                               io_lib:format("~ts_extra.beam", [Name1])]),
+    ExpectOne = code:which(Mod1).
+
+paths_extra_dirs_in_project_root(Config) ->
+    AppDir = ?config(apps, Config),
+
+    RebarConfig = [{erl_opts, [{extra_src_dirs, ["extra"]}]}],
+
+    {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return),
+
+    code:add_paths(rebar_state:code_paths(State, all_deps)),
+    {module, extra} = code:ensure_loaded(extra),
+
+    Expect = filename:join([AppDir, "_build", "default", "extras", "extra", "extra.beam"]),
+    Expect = code:which(extra).
+
+clean_basic_app(Config) ->
+    [Name] = ?config(app_names, Config),
+
+    rebar_test_utils:run_and_check(Config, [], ["clean"], {ok, [{app, Name, invalid}]}).
+
+clean_release_apps(Config) ->
+    [Name1, Name2] = ?config(app_names, Config),
+
+    rebar_test_utils:run_and_check(Config, [], ["clean"],
+                                   {ok, [{app, Name1, invalid}, {app, Name2, invalid}]}).
+
+clean_basic_extra_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name] = ?config(app_names, Config),
+
+    rebar_test_utils:run_and_check(Config, [], ["clean"], {ok, [{app, Name, invalid}]}),
+
+    Beam = lists:flatten(io_lib:format("~ts_extra", [Name])),
+    false = ec_file:exists(filename:join([AppDir, "_build", "default", "lib", Name, "extras", Beam])).
+
+clean_release_extra_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+
+    rebar_test_utils:run_and_check(Config, [], ["clean"],
+                                   {ok, [{app, Name1, invalid}, {app, Name2, invalid}]}),
+
+    Beam1 = lists:flatten(io_lib:format("~ts_extra", [Name1])),
+    false = ec_file:exists(filename:join([AppDir, "_build", "default", "lib", Name1, "extras", Beam1])),
+    Beam2 = lists:flatten(io_lib:format("~ts_extra", [Name2])),
+    false = ec_file:exists(filename:join([AppDir, "_build", "default", "lib", Name2, "extras", Beam2])).
+
+clean_extra_dirs_in_project_root(Config) ->
+    AppDir = ?config(apps, Config),
+    [Name1, Name2] = ?config(app_names, Config),
+
+    rebar_test_utils:run_and_check(Config, [], ["clean"],
+                                   {ok, [{app, Name1, invalid}, {app, Name2, invalid}]}),
+
+    false = ec_file:exists(filename:join([AppDir, "_build", "default", "extras"])).
 
 recompile_when_hrl_changes(Config) ->
     AppDir = ?config(apps, Config),
@@ -168,7 +652,7 @@ recompile_when_hrl_changes(Config) ->
     rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name}]}),
 
     EbinDir = filename:join([AppDir, "_build", "default", "lib", Name, "ebin"]),
-    {ok, Files} = file:list_dir(EbinDir),
+    {ok, Files} = rebar_utils:list_dir(EbinDir),
     ModTime = [filelib:last_modified(filename:join([EbinDir, F]))
                || F <- Files, filename:extension(F) == ".beam"],
 
@@ -179,7 +663,7 @@ recompile_when_hrl_changes(Config) ->
 
     rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name}]}),
 
-    {ok, NewFiles} = file:list_dir(EbinDir),
+    {ok, NewFiles} = rebar_utils:list_dir(EbinDir),
     NewModTime = [filelib:last_modified(filename:join([EbinDir, F]))
                   || F <- NewFiles, filename:extension(F) == ".beam"],
 
@@ -195,7 +679,7 @@ recompile_when_opts_change(Config) ->
     rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name}]}),
 
     EbinDir = filename:join([AppDir, "_build", "default", "lib", Name, "ebin"]),
-    {ok, Files} = file:list_dir(EbinDir),
+    {ok, Files} = rebar_utils:list_dir(EbinDir),
     ModTime = [filelib:last_modified(filename:join([EbinDir, F]))
                || F <- Files, filename:extension(F) == ".beam"],
 
@@ -205,7 +689,7 @@ recompile_when_opts_change(Config) ->
 
     rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name}]}),
 
-    {ok, NewFiles} = file:list_dir(EbinDir),
+    {ok, NewFiles} = rebar_utils:list_dir(EbinDir),
     NewModTime = [filelib:last_modified(filename:join([EbinDir, F]))
                   || F <- NewFiles, filename:extension(F) == ".beam"],
 
@@ -221,7 +705,7 @@ dont_recompile_when_opts_dont_change(Config) ->
     rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name}]}),
 
     EbinDir = filename:join([AppDir, "_build", "default", "lib", Name, "ebin"]),
-    {ok, Files} = file:list_dir(EbinDir),
+    {ok, Files} = rebar_utils:list_dir(EbinDir),
     ModTime = [filelib:last_modified(filename:join([EbinDir, F]))
                || F <- Files, filename:extension(F) == ".beam"],
 
@@ -229,7 +713,7 @@ dont_recompile_when_opts_dont_change(Config) ->
 
     rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name}]}),
 
-    {ok, NewFiles} = file:list_dir(EbinDir),
+    {ok, NewFiles} = rebar_utils:list_dir(EbinDir),
     NewModTime = [filelib:last_modified(filename:join([EbinDir, F]))
                   || F <- NewFiles, filename:extension(F) == ".beam"],
 
@@ -332,7 +816,8 @@ deps_in_path(Config) ->
     %% find pkg name in there
     ?assertNotEqual([], [Path || Path <- code:get_path(),
                                  {match, _} <- [re:run(Path, PkgName)]]),
-    code:set_path(StartPaths),
+
+    true = code:set_path(lists:filter(fun(P) -> ec_file:exists(P) end, StartPaths)),
     %% Make sure apps we look for are not visible again
     %% Hope not to find src name
     ?assertEqual([], [Path || Path <- code:get_path(),
@@ -639,10 +1124,10 @@ clean_all(Config) ->
     ),
 
     %% Clean all
-    rebar_test_utils:run_and_check(
-        Config, RConf, ["clean", "--all"],
-        {ok, [{app, Name, invalid}, {app, DepName, invalid}, {app, PkgName, invalid}]}
-    ).
+    rebar_test_utils:run_and_check(Config, [], ["clean", "--all"],
+                                   {ok, [{app, Name, invalid},
+                                         {app, DepName, invalid},
+                                         {app, PkgName, invalid}]}).
 
 override_deps(Config) ->
     mock_git_resource:mock([{deps, [{some_dep, "0.0.1"},{other_dep, "0.0.1"}]}]),
@@ -682,30 +1167,3 @@ profile_override_deps(Config) ->
         {ok, [{dep, "some_dep"},{dep_not_exist, "other_dep"}]}
     ).
 
-build_more_sources(Config) ->
-    AppDir = ?config(apps, Config),
-
-    ASrc = <<"-module(a_src).\n-export([ok/0]).\nok() -> ok.\n">>,
-    BSrc = <<"-module(b_src).\n-export([ok/0]).\nok() -> ok.\n">>,
-    CSrc = <<"-module(c_src).\n-export([ok/0]).\nok() -> ok.\n">>,
-
-    ok = filelib:ensure_dir(filename:join([AppDir, "more", "dummy"])),
-    ok = filelib:ensure_dir(filename:join([AppDir, "ebin", "dummy"])),
-    ok = file:write_file(filename:join([AppDir, "more", "a_src.erl"]), ASrc),
-    ok = file:write_file(filename:join([AppDir, "more", "b_src.erl"]), BSrc),
-    ok = file:write_file(filename:join([AppDir, "more", "c_src.erl"]), CSrc),
-
-    Opts = dict:new(),
-
-    rebar_erlc_compiler:compile(Opts,
-                                filename:join([AppDir, "more"]),
-                                filename:join([AppDir, "ebin"]),
-                                [filename:join([AppDir, "more", "a_src.erl"]),
-                                 filename:join([AppDir, "more", "b_src.erl"]),
-                                 filename:join([AppDir, "more", "c_src.erl"])]),
-
-    EbinDir = filename:join([AppDir, "ebin"]),
-    true = filelib:is_file(filename:join([EbinDir, "a_src.beam"])),
-    true = filelib:is_file(filename:join([EbinDir, "b_src.beam"])),
-    true = filelib:is_file(filename:join([EbinDir, "c_src.beam"])).
-
diff --git a/test/rebar_cover_SUITE.erl b/test/rebar_cover_SUITE.erl
index 1fae92c..ba078c2 100644
--- a/test/rebar_cover_SUITE.erl
+++ b/test/rebar_cover_SUITE.erl
@@ -7,6 +7,9 @@
          all/0,
          flag_coverdata_written/1,
          config_coverdata_written/1,
+         basic_extra_src_dirs/1,
+         release_extra_src_dirs/1,
+         root_extra_src_dirs/1,
          index_written/1,
          flag_verbose/1,
          config_verbose/1]).
@@ -29,6 +32,8 @@ init_per_testcase(_, Config) ->
 
 all() ->
     [flag_coverdata_written, config_coverdata_written,
+     basic_extra_src_dirs, release_extra_src_dirs,
+     root_extra_src_dirs,
      index_written,
      flag_verbose, config_verbose].
 
@@ -62,6 +67,88 @@ config_coverdata_written(Config) ->
 
     true = filelib:is_file(filename:join([AppDir, "_build", "test", "cover", "eunit.coverdata"])).
 
+basic_extra_src_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name = rebar_test_utils:create_random_name("cover_extra_"),
+    Vsn = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]),
+
+    ExtraSrc = io_lib:format("-module(~ts_extra).\n-export([ok/0]).\nok() -> ok.\n", [Name]),
+
+    ok = filelib:ensure_dir(filename:join([AppDir, "extra", "dummy"])),
+    ok = file:write_file(filename:join([AppDir, "extra", io_lib:format("~ts_extra.erl", [Name])]),
+                         ExtraSrc),
+
+    RebarConfig = [{erl_opts, [{d, some_define}]}, {extra_src_dirs, ["extra"]}],
+    rebar_test_utils:run_and_check(Config,
+                                   RebarConfig,
+                                   ["eunit", "--cover"],
+                                   {ok, [{app, Name}]}),
+
+    Mod = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name]))),
+    {file, _} = cover:is_compiled(Mod).
+
+release_extra_src_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name1 = rebar_test_utils:create_random_name("relapp1_"),
+    Vsn1 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name1]), Name1, Vsn1, [kernel, stdlib]),
+
+    Name2 = rebar_test_utils:create_random_name("relapp2_"),
+    Vsn2 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name2]), Name2, Vsn2, [kernel, stdlib]),
+
+    ExtraOne = io_lib:format("-module(~ts_extra).\n-export([ok/0]).\nok() -> ok.\n", [Name1]),
+
+    ok = filelib:ensure_dir(filename:join([AppDir, "apps", Name1, "extra", "dummy"])),
+    ok = file:write_file(filename:join([AppDir, "apps", Name1, "extra",
+                                        io_lib:format("~ts_extra.erl", [Name1])]),
+                         ExtraOne),
+
+    ExtraTwo = io_lib:format("-module(~ts_extra).\n-export([ok/0]).\nok() -> ok.\n", [Name2]),
+
+    ok = filelib:ensure_dir(filename:join([AppDir, "apps", Name2, "extra", "dummy"])),
+    ok = file:write_file(filename:join([AppDir, "apps", Name2, "extra",
+                                        io_lib:format("~ts_extra.erl", [Name2])]),
+                         ExtraTwo),
+
+    RebarConfig = [{erl_opts, [{d, some_define}]}, {extra_src_dirs, ["extra"]}],
+    rebar_test_utils:run_and_check(Config,
+                                   RebarConfig,
+                                   ["eunit", "--cover"],
+                                   {ok, [{app, Name1}, {app, Name2}]}),
+
+    Mod1 = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name1]))),
+    {file, _} = cover:is_compiled(Mod1),
+    Mod2 = list_to_atom(lists:flatten(io_lib:format("~ts_extra", [Name2]))),
+    {file, _} = cover:is_compiled(Mod2).
+
+root_extra_src_dirs(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name1 = rebar_test_utils:create_random_name("relapp1_"),
+    Vsn1 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name1]), Name1, Vsn1, [kernel, stdlib]),
+
+    Name2 = rebar_test_utils:create_random_name("relapp2_"),
+    Vsn2 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir, "apps", Name2]), Name2, Vsn2, [kernel, stdlib]),
+
+    Extra = <<"-module(extra).\n-export([ok/0]).\nok() -> ok.\n">>,
+
+    ok = filelib:ensure_dir(filename:join([AppDir, "extra", "dummy"])),
+    ok = file:write_file(filename:join([AppDir, "extra", "extra.erl"]), Extra),
+
+    RebarConfig = [{erl_opts, [{d, some_define}]}, {extra_src_dirs, ["extra"]}],
+    rebar_test_utils:run_and_check(Config,
+                                   RebarConfig,
+                                   ["eunit", "--cover"],
+                                   {ok, [{app, Name1}, {app, Name2}]}),
+
+    {file, _} = cover:is_compiled(extra).
+
 index_written(Config) ->
     AppDir = ?config(apps, Config),
 
diff --git a/test/rebar_ct_SUITE.erl b/test/rebar_ct_SUITE.erl
index 95a411f..cdd3774 100644
--- a/test/rebar_ct_SUITE.erl
+++ b/test/rebar_ct_SUITE.erl
@@ -204,6 +204,7 @@ multi_app_default_beams(Config) ->
     File3 = filename:join([AppDir,
                            "_build",
                            "test",
+                           "extras",
                            "test",
                            "extras_SUITE.beam"]),
 
diff --git a/test/rebar_eunit_SUITE.erl b/test/rebar_eunit_SUITE.erl
index 903bd96..609be51 100644
--- a/test/rebar_eunit_SUITE.erl
+++ b/test/rebar_eunit_SUITE.erl
@@ -125,7 +125,9 @@ basic_app_files(Config) ->
     AppDir = ?config(apps, Config),
 
     lists:foreach(fun(F) -> true = ec_file:exists(filename:join([AppDir, "_build", "test", "lib", "basic_app", "ebin", F])) end,
-                  ["basic_app.app", "basic_app.beam", "basic_app_tests.beam", "basic_app_tests_helper.beam"]).
+                  ["basic_app.app", "basic_app.beam"]),
+    lists:foreach(fun(F) -> true = ec_file:exists(filename:join([AppDir, "_build", "test", "lib", "basic_app", "test", F])) end,
+                  ["basic_app_tests.beam", "basic_app_tests_helper.beam"]).
 
 %% check that the correct tests are exported from modules for project
 %% note that this implies `TEST` is set correctly
@@ -171,10 +173,14 @@ multi_app_files(Config) ->
     AppDir = ?config(apps, Config),
 
     lists:foreach(fun(F) -> true = ec_file:exists(filename:join([AppDir, "_build", "test", "lib", "multi_app_bar", "ebin", F])) end,
-                  ["multi_app_bar.app", "multi_app_bar.beam", "multi_app_bar_tests.beam", "multi_app_bar_tests_helper.beam"]),
+                  ["multi_app_bar.app", "multi_app_bar.beam"]),
     lists:foreach(fun(F) -> true = ec_file:exists(filename:join([AppDir, "_build", "test", "lib", "multi_app_baz", "ebin", F])) end,
-                  ["multi_app_baz.app", "multi_app_baz.beam", "multi_app_baz_tests.beam", "multi_app_baz_tests_helper.beam"]),
-    lists:foreach(fun(F) -> true = ec_file:exists(filename:join([AppDir, "_build", "test", "test", F])) end,
+                  ["multi_app_baz.app", "multi_app_baz.beam"]),
+    lists:foreach(fun(F) -> true = ec_file:exists(filename:join([AppDir, "_build", "test", "lib", "multi_app_bar", "test", F])) end,
+                  ["multi_app_bar_tests.beam", "multi_app_bar_tests_helper.beam"]),
+    lists:foreach(fun(F) -> true = ec_file:exists(filename:join([AppDir, "_build", "test", "lib", "multi_app_baz", "test", F])) end,
+                  ["multi_app_baz_tests.beam", "multi_app_baz_tests_helper.beam"]),
+    lists:foreach(fun(F) -> true = ec_file:exists(filename:join([AppDir, "_build", "test", "extras", "test", F])) end,
                   ["multi_app_tests.beam", "multi_app_tests_helper.beam"]).
 
 %% check that the correct tests are exported from modules for project
@@ -202,7 +208,9 @@ multi_app_testset(Config) ->
     AppDir = ?config(apps, Config),
     Result = ?config(result, Config),
 
-    Set = {ok, [{application, multi_app_bar}, {application, multi_app_baz}, {dir, filename:join([AppDir, "_build", "test", "test"])}]},
+    Set = {ok, [{application, multi_app_bar},
+                {application, multi_app_baz},
+                {dir, filename:join([AppDir, "test"])}]},
     Set = rebar_prv_eunit:prepare_tests(Result).
 
 
diff --git a/test/rebar_file_utils_SUITE.erl b/test/rebar_file_utils_SUITE.erl
index 4324a5f..a061325 100644
--- a/test/rebar_file_utils_SUITE.erl
+++ b/test/rebar_file_utils_SUITE.erl
@@ -64,7 +64,7 @@ reset_nonexistent_dir(Config) ->
     ?assertNot(filelib:is_dir(TmpDir)),
     ok = rebar_file_utils:reset_dir(TmpDir),
     ?assert(filelib:is_dir(TmpDir)),
-    {ok, []} = file:list_dir(TmpDir).
+    {ok, []} = rebar_utils:list_dir(TmpDir).
 
 reset_empty_dir(Config) ->
     TmpDir = ?config(tmpdir, Config),
@@ -73,7 +73,7 @@ reset_empty_dir(Config) ->
     ?assert(filelib:is_dir(TmpDir)),
     ok = rebar_file_utils:reset_dir(TmpDir),
     ?assert(filelib:is_dir(TmpDir)),
-    {ok, []} = file:list_dir(TmpDir).
+    {ok, []} = rebar_utils:list_dir(TmpDir).
 
 reset_dir(Config) ->
     TmpDir = ?config(tmpdir, Config),
@@ -86,7 +86,7 @@ reset_dir(Config) ->
                   ["a", "b", "c"]),
     ok = rebar_file_utils:reset_dir(TmpDir),
     ?assert(filelib:is_dir(TmpDir)),
-    {ok, []} = file:list_dir(TmpDir).
+    {ok, []} = rebar_utils:list_dir(TmpDir).
 
 path_from_ancestor(_Config) ->
     ?assertEqual({ok, "foo/bar/baz"}, rebar_file_utils:path_from_ancestor("/foo/bar/baz", "/")),
diff --git a/test/rebar_src_dirs_SUITE.erl b/test/rebar_src_dirs_SUITE.erl
index e29dcf0..5a00515 100644
--- a/test/rebar_src_dirs_SUITE.erl
+++ b/test/rebar_src_dirs_SUITE.erl
@@ -132,9 +132,9 @@ build_basic_app(Config) ->
 
     rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], {ok, [{app, Name}]}),
 
-    %% check that `extra.erl` was compiled to the `ebin` dir
-    Ebin = filename:join([AppDir, "_build", "default", "lib", Name, "ebin"]),
-    true = filelib:is_file(filename:join([Ebin, "extra.beam"])),
+    %% check that `extra.erl` was compiled to the `extra` dir
+    ExtraOut = filename:join([AppDir, "_build", "default", "lib", Name, "extra"]),
+    true = filelib:is_file(filename:join([ExtraOut, "extra.beam"])),
 
     %% check that `extra.erl` is not in the `modules` key of the app
     {ok, App} = file:consult(filename:join([AppDir,
@@ -176,11 +176,11 @@ 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"])),
+    ExtraOut1 = filename:join([AppDir, "_build", "default", "lib", Name1, "extra"]),
+    true = filelib:is_file(filename:join([ExtraOut1, "extra1.beam"])),
 
-    Ebin2 = filename:join([AppDir, "_build", "default", "lib", Name2, "ebin"]),
-    true = filelib:is_file(filename:join([Ebin2, "extra2.beam"])),
+    ExtraOut2 = filename:join([AppDir, "_build", "default", "lib", Name2, "extra"]),
+    true = filelib:is_file(filename:join([ExtraOut2, "extra2.beam"])),
 
     %% check that `extraX.erl` is not in the `modules` key of the app
     {ok, App1} = file:consult(filename:join([AppDir,
@@ -221,10 +221,9 @@ src_dir_takes_precedence_over_extra(Config) ->
 
     rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], {ok, [{app, Name}]}),
 
-    %% check that `extra.erl` was compiled to the `ebin` dir
-    %% check that `extraX.erl` was compiled to the `ebin` dir
-    Ebin = filename:join([AppDir, "_build", "default", "lib", Name, "ebin"]),
-    true = filelib:is_file(filename:join([Ebin, "extra.beam"])),
+    %% check that `extra.erl` was compiled to the `extra` dir
+    ExtraOut = filename:join([AppDir, "_build", "default", "lib", Name, "extra"]),
+    true = filelib:is_file(filename:join([ExtraOut, "extra.beam"])),
 
     %% check that `extra.erl` is in the `modules` key of the app
     {ok, App} = file:consult(filename:join([AppDir,
diff --git a/test/rebar_test_utils.erl b/test/rebar_test_utils.erl
index ca5e91a..3943db7 100644
--- a/test/rebar_test_utils.erl
+++ b/test/rebar_test_utils.erl
@@ -334,7 +334,7 @@ check_results(AppDir, Expected, ProfileRun) ->
                     {ok, RelxState3} = rlx_prv_rel_discover:do(RelxState2),
 
                     LibDir = filename:join([ReleaseDir, Name, "lib"]),
-                    {ok, RelLibs} = file:list_dir(LibDir),
+                    {ok, RelLibs} = rebar_utils:list_dir(LibDir),
                     IsSymLinkFun =
                         fun(X) ->
                                 ec_file:is_symlink(filename:join(LibDir, X))
@@ -357,6 +357,9 @@ check_results(AppDir, Expected, ProfileRun) ->
         ;  ({file, Filename}) ->
                 ct:pal("Filename: ~s", [Filename]),
                 ?assert(filelib:is_file(Filename))
+        ;  ({dir, Dirname}) ->
+                ct:pal("Directory: ~s", [Dirname]),
+                ?assert(filelib:is_dir(Dirname))
         end, Expected).
 
 write_src_file(Dir, Name) ->
@@ -422,7 +425,7 @@ get_app_metadata(Name, Vsn, Deps) ->
 
 package_app(AppDir, DestDir, PkgName) ->
     Name = PkgName++".tar",
-    {ok, Fs} = file:list_dir(AppDir),
+    {ok, Fs} = rebar_utils:list_dir(AppDir),
     ok = erl_tar:create(filename:join(DestDir, "contents.tar.gz"),
                         lists:zip(Fs, [filename:join(AppDir,F) || F <- Fs]),
                         [compressed]),