From 298743d50e58ed472f70498297c31d7ebb68fbd6 Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Wed, 27 Nov 2013 15:12:19 +0100 Subject: [PATCH] Add test for regression caused by 252b31f (#90) --- inttest/depplugins/base_dir_cwd_plugin.erl | 7 +++++ inttest/depplugins/dep_cwd_plugin.erl | 7 +++++ inttest/depplugins/depplugins_rt.erl | 30 +++++++++++++++++----- inttest/depplugins/rebar.config | 1 + inttest/depplugins/rebar_testplugin.config | 1 + inttest/depplugins/testplugin_mod.erl | 9 ++++--- 6 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 inttest/depplugins/base_dir_cwd_plugin.erl create mode 100644 inttest/depplugins/dep_cwd_plugin.erl create mode 100644 inttest/depplugins/rebar_testplugin.config diff --git a/inttest/depplugins/base_dir_cwd_plugin.erl b/inttest/depplugins/base_dir_cwd_plugin.erl new file mode 100644 index 0000000..4953b8b --- /dev/null +++ b/inttest/depplugins/base_dir_cwd_plugin.erl @@ -0,0 +1,7 @@ +-module(base_dir_cwd_plugin). +-export([pre_compile/2]). + +pre_compile(_, _) -> + File = "base_dir_cwd_pre.compile", + ok = file:write_file(File, <<"base_dir cwd pre_compile plugin">>), + rebar_log:log(info, "Wrote ~p/~s~n", [rebar_utils:get_cwd(), File]). diff --git a/inttest/depplugins/dep_cwd_plugin.erl b/inttest/depplugins/dep_cwd_plugin.erl new file mode 100644 index 0000000..fe1ceba --- /dev/null +++ b/inttest/depplugins/dep_cwd_plugin.erl @@ -0,0 +1,7 @@ +-module(dep_cwd_plugin). +-export([pre_compile/2]). + +pre_compile(_, _) -> + File = "dep_cwd_pre.compile", + ok = file:write_file(File, <<"dep cwd pre_compile plugin">>), + rebar_log:log(info, "Wrote ~p/~s~n", [rebar_utils:get_cwd(), File]). diff --git a/inttest/depplugins/depplugins_rt.erl b/inttest/depplugins/depplugins_rt.erl index 7b106eb..4b0bbd6 100644 --- a/inttest/depplugins/depplugins_rt.erl +++ b/inttest/depplugins/depplugins_rt.erl @@ -20,21 +20,37 @@ files() -> [ {copy, "../../rebar", "rebar"}, {copy, "rebar.config", "rebar.config"}, + {copy, "base_dir_cwd_plugin.erl", "base_dir_cwd_plugin.erl"}, {create, "ebin/fish.app", app(fish, [])}, - {create, "deps/dependsonplugin/ebin/dependsonplugin.app", - app(dependsonplugin, [])}, {copy, "rebar_dependsonplugin.config", - "deps/dependsonplugin/rebar.config"}, + "deps/dependsonplugin/rebar.config"}, + {create, "deps/dependsonplugin/ebin/dependsonplugin.app", + app(dependsonplugin, [])}, + + {copy, "rebar_testplugin.config", "deps/testplugin/rebar.config"}, {copy, "testplugin_mod.erl", - "deps/testplugin/plugins/testplugin_mod.erl"}, - {create, "deps/testplugin/ebin/testplugin.app", - app(testplugin, [])} + "deps/testplugin/plugins/testplugin_mod.erl"}, + {copy, "dep_cwd_plugin.erl", "deps/testplugin/dep_cwd_plugin.erl"}, + {create, "deps/testplugin/ebin/testplugin.app", app(testplugin, [])} ]. run(_Dir) -> ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])), - ?assertEqual(true, filelib:is_regular("deps/dependsonplugin/pre.compile")), + + ?assertEqual(true, filelib:is_regular("base_dir_cwd_pre.compile")), + + ?assertEqual(true, filelib:is_regular( + "deps/dependsonplugin/base_dir_cwd_pre.compile")), + ?assertEqual(true, filelib:is_regular( + "deps/dependsonplugin/plugin_pre.compile")), + + ?assertEqual(true, filelib:is_regular( + "deps/testplugin/base_dir_cwd_pre.compile")), + ?assertEqual(true, filelib:is_regular( + "deps/testplugin/dep_cwd_pre.compile")), + ?assertEqual(true, filelib:is_regular( + "deps/testplugin/plugin_pre.compile")), ok. %% diff --git a/inttest/depplugins/rebar.config b/inttest/depplugins/rebar.config index 3a2e34e..86fb037 100644 --- a/inttest/depplugins/rebar.config +++ b/inttest/depplugins/rebar.config @@ -1 +1,2 @@ {deps, [dependsonplugin]}. +{plugins, [base_dir_cwd_plugin]}. diff --git a/inttest/depplugins/rebar_testplugin.config b/inttest/depplugins/rebar_testplugin.config new file mode 100644 index 0000000..58a1f99 --- /dev/null +++ b/inttest/depplugins/rebar_testplugin.config @@ -0,0 +1 @@ +{plugins, [dep_cwd_plugin]}. diff --git a/inttest/depplugins/testplugin_mod.erl b/inttest/depplugins/testplugin_mod.erl index 055bbc7..d829ff0 100644 --- a/inttest/depplugins/testplugin_mod.erl +++ b/inttest/depplugins/testplugin_mod.erl @@ -1,6 +1,7 @@ -module(testplugin_mod). --compile(export_all). +-export([pre_compile/2]). -pre_compile(Config, _) -> - ok = file:write_file("pre.compile", <<"Yadda!">>), - rebar_log:log(info, "Wrote ~p/pre.compile~n", [rebar_utils:get_cwd()]). +pre_compile(_, _) -> + File = "plugin_pre.compile", + ok = file:write_file(File, <<"Yadda!">>), + rebar_log:log(info, "Wrote ~p/~s~n", [rebar_utils:get_cwd(), File]).