浏览代码

sort-as: show issue more clearly

pull/1716/head
Pierre Fenoll 7 年前
父节点
当前提交
abad0e14bb
共有 2 个文件被更改,包括 20 次插入3 次删除
  1. +4
    -0
      src/rebar_state.erl
  2. +16
    -3
      test/rebar_profiles_SUITE.erl

+ 4
- 0
src/rebar_state.erl 查看文件

@ -43,6 +43,10 @@
allow_provider_overrides/1, allow_provider_overrides/2
]).
-ifdef(TEST).
-export([deduplicate/1]).
-endif.
-include("rebar.hrl").
-include_lib("providers/include/providers.hrl").

+ 16
- 3
test/rebar_profiles_SUITE.erl 查看文件

@ -28,7 +28,8 @@
test_profile_erl_opts_order_4/1,
test_profile_erl_opts_order_5/1,
test_erl_opts_debug_info/1,
first_files_exception/1]).
first_files_exception/1,
deduplication_stability/1]).
-include_lib("common_test/include/ct.hrl").
-include_lib("eunit/include/eunit.hrl").
@ -52,7 +53,8 @@ all() ->
test_profile_erl_opts_order_4,
test_profile_erl_opts_order_5,
test_erl_opts_debug_info,
first_files_exception].
first_files_exception,
deduplication_stability].
init_per_suite(Config) ->
application:start(meck),
@ -133,7 +135,7 @@ profile_merge_umbrella_keys(Config) ->
{profiles,
[{ct,
[{vals, [{a,1},{b,2}]}]}]}],
SubRebarConfig = [{vals, []},
{profiles, [{ct, [{vals, [{c,1}]}]}]}],
@ -546,6 +548,17 @@ 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],

正在加载...
取消
保存