diff options
| -rw-r--r-- | src/rebar_state.erl | 4 | ||||
| -rw-r--r-- | test/rebar_profiles_SUITE.erl | 19 |
2 files changed, 3 insertions, 20 deletions
diff --git a/src/rebar_state.erl b/src/rebar_state.erl index 8c100aa..7ebe6da 100644 --- a/src/rebar_state.erl +++ b/src/rebar_state.erl @@ -43,10 +43,6 @@ allow_provider_overrides/1, allow_provider_overrides/2 ]). --ifdef(TEST). --export([deduplicate/1]). --endif. - -include("rebar.hrl"). -include_lib("providers/include/providers.hrl"). diff --git a/test/rebar_profiles_SUITE.erl b/test/rebar_profiles_SUITE.erl index 9f7912d..6afdc39 100644 --- a/test/rebar_profiles_SUITE.erl +++ b/test/rebar_profiles_SUITE.erl @@ -28,8 +28,7 @@ test_profile_erl_opts_order_4/1, test_profile_erl_opts_order_5/1, test_erl_opts_debug_info/1, - first_files_exception/1, - deduplication_stability/1]). + first_files_exception/1]). -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). @@ -53,8 +52,7 @@ all() -> test_profile_erl_opts_order_4, test_profile_erl_opts_order_5, test_erl_opts_debug_info, - first_files_exception, - deduplication_stability]. + first_files_exception]. init_per_suite(Config) -> application:start(meck), @@ -135,7 +133,7 @@ profile_merge_umbrella_keys(Config) -> {profiles, [{ct, [{vals, [{a,1},{b,2}]}]}]}], - + SubRebarConfig = [{vals, []}, {profiles, [{ct, [{vals, [{c,1}]}]}]}], @@ -548,17 +546,6 @@ first_files_exception(_Config) -> ?assertEqual(["c","a","b","a","e"], rebar_state:get(State1, mib_first_files)), ok. -deduplication_stability(_Config) -> - ?assertEqual([default,all_deps_test], rebar_state:deduplicate([default,all_deps_test])), - ?assertEqual([default,profile1,profile2], rebar_state:deduplicate([default,profile1,profile2])), - ?assertEqual([default,bar,foo], rebar_state:deduplicate([default,bar,foo,bar])), %% master wants [default,foo,bar] - ?assertEqual([default,test,bar], rebar_state:deduplicate([default,test,bar])), - ?assertEqual([default,test,bar], rebar_state:deduplicate([default,test,bar,test])), - ?assertEqual([default,profile1], rebar_state:deduplicate([default,profile1,profile1,profile1])), - ?assertEqual([default,a,b,c,d,e], rebar_state:deduplicate([default,a,b,c,d,e,a,e,b])), - ?assertEqual([default,test], rebar_state:deduplicate([default,test])), - ok. - get_compiled_profile_erl_opts(Profiles, Config) -> AppDir = ?config(apps, Config), PStrs = [atom_to_list(P) || P <- Profiles], |