diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2018-06-08 23:42:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 23:42:15 -0400 |
| commit | 7eb5d14d5370e49be7498ed65046673bc73d0a00 (patch) | |
| tree | 20fe3bf61bb2376e12adf1ccbf890de1cf8753af | |
| parent | ca36f30fe302c8a23f2e46ec077304cbb208999c (diff) | |
| parent | a74dc021cc9dd89b7448d894e262ebe5a82285cd (diff) | |
Merge pull request #1810 from tsloughter/bare-ns
run compile provider in default namespace from bare
| -rw-r--r-- | src/rebar_prv_bare_compile.erl | 4 | ||||
| -rw-r--r-- | test/rebar_hooks_SUITE.erl | 19 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/rebar_prv_bare_compile.erl b/src/rebar_prv_bare_compile.erl index c29a711..5d3e977 100644 --- a/src/rebar_prv_bare_compile.erl +++ b/src/rebar_prv_bare_compile.erl @@ -46,7 +46,9 @@ do(State) -> [AppInfo] = rebar_state:project_apps(State), AppInfo1 = rebar_app_info:out_dir(AppInfo, rebar_dir:get_cwd()), - rebar_prv_compile:compile(State, AppInfo1), + + %% run compile in the default namespace + rebar_prv_compile:compile(rebar_state:namespace(State, default), AppInfo1), rebar_utils:cleanup_code_path(OrigPath), diff --git a/test/rebar_hooks_SUITE.erl b/test/rebar_hooks_SUITE.erl index a36dbe1..1f3edd2 100644 --- a/test/rebar_hooks_SUITE.erl +++ b/test/rebar_hooks_SUITE.erl @@ -13,6 +13,7 @@ run_hooks_for_plugins/1, eunit_app_hooks/1, deps_hook_namespace/1, + bare_compile_hooks_default_ns/1, deps_clean_hook_namespace/1]). -include_lib("common_test/include/ct.hrl"). @@ -37,7 +38,7 @@ end_per_testcase(_, _Config) -> all() -> [build_and_clean_app, run_hooks_once, run_hooks_once_profiles, escriptize_artifacts, run_hooks_for_plugins, deps_hook_namespace, - deps_clean_hook_namespace, eunit_app_hooks]. + bare_compile_hooks_default_ns, deps_clean_hook_namespace, eunit_app_hooks]. %% Test post provider hook cleans compiled project app, leaving it invalid build_and_clean_app(Config) -> @@ -135,6 +136,22 @@ deps_hook_namespace(Config) -> {ok, [{dep, "some_dep"}]} ). +%% tests that hooks to compile when running bare compile run in the default namespace +bare_compile_hooks_default_ns(Config) -> + AppDir = ?config(apps, Config), + + 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]), + + RConfFile = rebar_test_utils:create_config(AppDir, + [{provider_hooks, [{post, [{compile, clean}]}]}]), + {ok, RConf} = file:consult(RConfFile), + rebar_test_utils:run_and_check( + Config, RConf, ["bare", "compile", "--paths", "."], + {ok, []} + ). + deps_clean_hook_namespace(Config) -> mock_git_resource:mock([{deps, [{some_dep, "0.0.1"}]}]), Deps = rebar_test_utils:expand_deps(git, [{"some_dep", "0.0.1", []}]), |