diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/rebar_compile_SUITE.erl | 33 | ||||
| -rw-r--r-- | test/rebar_ct_SUITE.erl | 19 | ||||
| -rw-r--r-- | test/rebar_deps_SUITE.erl | 34 | ||||
| -rw-r--r-- | test/rebar_dialyzer_SUITE.erl | 73 | ||||
| -rw-r--r-- | test/rebar_localfs_resource.erl | 38 |
5 files changed, 188 insertions, 9 deletions
diff --git a/test/rebar_compile_SUITE.erl b/test/rebar_compile_SUITE.erl index f726943..7750924 100644 --- a/test/rebar_compile_SUITE.erl +++ b/test/rebar_compile_SUITE.erl @@ -25,7 +25,8 @@ only_default_transitive_deps/1, clean_all/1, override_deps/1, - profile_override_deps/1]). + profile_override_deps/1, + build_more_sources/1]). -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). @@ -54,7 +55,7 @@ all() -> 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, only_default_transitive_deps, - clean_all, override_deps, profile_override_deps]. + clean_all, override_deps, profile_override_deps, build_more_sources]. build_basic_app(Config) -> AppDir = ?config(apps, Config), @@ -631,3 +632,31 @@ profile_override_deps(Config) -> Config, RebarConfig, ["as", "a", "compile"], {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_ct_SUITE.erl b/test/rebar_ct_SUITE.erl index 0a86127..95a411f 100644 --- a/test/rebar_ct_SUITE.erl +++ b/test/rebar_ct_SUITE.erl @@ -17,13 +17,15 @@ multi_suite/1, all_suite/1, single_dir_and_single_suite/1, - symlinked_dir_overwritten_fix/1]). + symlinked_dir_overwritten_fix/1, + data_dir_correct/1]). -include_lib("common_test/include/ct.hrl"). all() -> [{group, basic_app}, {group, multi_app}, - {group, dirs_and_suites}]. + {group, dirs_and_suites}, + {group, data_dirs}]. groups() -> [{basic_app, [], [basic_app_default_dirs, basic_app_default_beams]}, @@ -38,7 +40,8 @@ groups() -> [{basic_app, [], [basic_app_default_dirs, multi_suite, all_suite, single_dir_and_single_suite, - symlinked_dir_overwritten_fix]}]. + symlinked_dir_overwritten_fix]}, + {data_dirs, [], [data_dir_correct]}]. init_per_group(basic_app, Config) -> C = rebar_test_utils:init_rebar_state(Config, "ct_"), @@ -139,7 +142,8 @@ init_per_group(dirs_and_suites, Config) -> ok = filelib:ensure_dir(Suite3), ok = file:write_file(Suite3, test_suite("extras")), - [{appnames, [Name1, Name2]}|C]. + [{appnames, [Name1, Name2]}|C]; +init_per_group(_, Config) -> Config. end_per_group(_Group, _Config) -> ok. @@ -544,7 +548,14 @@ symlinked_dir_overwritten_fix(Config) -> {ok, _} = rebar_test_utils:run_and_check(Config, [], ["as", "test", "compile"], return). +%% this test probably only fails when this suite is run via rebar3 with the --cover flag +data_dir_correct(Config) -> + DataDir = ?config(data_dir, Config), + Parts = filename:split(DataDir), + ["rebar_ct_SUITE_data","test","rebar","lib","test","_build"|_] = lists:reverse(Parts). + +%% helper for generating test data test_suite(Name) -> io_lib:format("-module(~ts_SUITE).\n" "-compile(export_all).\n" diff --git a/test/rebar_deps_SUITE.erl b/test/rebar_deps_SUITE.erl index fd86226..fcc46c3 100644 --- a/test/rebar_deps_SUITE.erl +++ b/test/rebar_deps_SUITE.erl @@ -3,7 +3,7 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -all() -> [sub_app_deps, newly_added_dep, http_proxy_settings, https_proxy_settings, {group, git}, {group, pkg}]. +all() -> [sub_app_deps, newly_added_dep, newly_added_after_empty_lock, http_proxy_settings, https_proxy_settings, {group, git}, {group, pkg}]. groups() -> [{all, [], [flat, pick_highest_left, pick_highest_right, @@ -29,6 +29,8 @@ init_per_group(_, Config) -> end_per_group(_, Config) -> Config. +init_per_testcase(newly_added_after_empty_lock, Config) -> + rebar_test_utils:init_rebar_state(Config); init_per_testcase(newly_added_dep, Config) -> rebar_test_utils:init_rebar_state(Config); init_per_testcase(sub_app_deps, Config) -> @@ -252,6 +254,36 @@ newly_added_dep(Config) -> Config, RebarConfig3, ["compile"], {ok, [{app, Name}, {dep, "a"}, {dep, "b", "1.0.0"}, {dep, "c", "1.0.0"}]}). +newly_added_after_empty_lock(Config) -> + AppDir = ?config(apps, Config), + Deps = rebar_test_utils:expand_deps(git, [{"a", "1.0.0", []}]), + {SrcDeps, _} = rebar_test_utils:flat_deps(Deps), + mock_git_resource:mock([{deps, SrcDeps}]), + + Name = rebar_test_utils:create_random_name("app_"), + Vsn = rebar_test_utils:create_random_vsn(), + + SubAppsDir = filename:join([AppDir, "apps", Name]), + rebar_test_utils:create_app(SubAppsDir, Name, Vsn, [kernel, stdlib]), + + TopDeps = rebar_test_utils:top_level_deps(rebar_test_utils:expand_deps(git, [])), + {ok, RebarConfig} = file:consult(rebar_test_utils:create_config(AppDir, [{deps, TopDeps}])), + rebar_test_utils:run_and_check( + Config, RebarConfig, ["compile"], + {ok, []}), + + %% Add a and c to top level + TopDeps2 = rebar_test_utils:top_level_deps(rebar_test_utils:expand_deps(git, [{"a", "1.0.0", []}])), + {ok, RebarConfig2} = file:consult(rebar_test_utils:create_config(AppDir, [{deps, TopDeps2}])), + LockFile = filename:join(AppDir, "rebar.lock"), + RebarConfig3 = rebar_config:merge_locks(RebarConfig2, + rebar_config:consult_lock_file(LockFile)), + + %% a should now be installed and c should not change + rebar_test_utils:run_and_check( + Config, RebarConfig3, ["compile"], + {ok, [{app, Name}, {dep, "a", "1.0.0"}]}). + http_proxy_settings(_Config) -> %% Load config diff --git a/test/rebar_dialyzer_SUITE.erl b/test/rebar_dialyzer_SUITE.erl index 3158e8f..31e02d9 100644 --- a/test/rebar_dialyzer_SUITE.erl +++ b/test/rebar_dialyzer_SUITE.erl @@ -7,7 +7,8 @@ all/0, update_base_plt/1, update_app_plt/1, - build_release_plt/1]). + build_release_plt/1, + plt_apps_option/1]). -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). @@ -38,7 +39,7 @@ init_per_testcase(Testcase, Config) -> rebar_test_utils:init_rebar_state(Config)]. all() -> - [update_base_plt, update_app_plt, build_release_plt]. + [update_base_plt, update_app_plt, build_release_plt, plt_apps_option]. update_base_plt(Config) -> AppDir = ?config(apps, Config), @@ -130,6 +131,58 @@ build_release_plt(Config) -> {ok, PltFiles} = plt_files(Plt), ?assertEqual(ErtsFiles, PltFiles). +plt_apps_option(Config) -> + AppDir = ?config(apps, Config), + RebarConfig = ?config(rebar_config, Config), + Plt = ?config(plt, Config), + State = ?config(state, Config), + + %% Create applications + Name1 = rebar_test_utils:create_random_name("app1_"), + Vsn1 = rebar_test_utils:create_random_vsn(), + rebar_test_utils:create_app(filename:join([AppDir,"deps",Name1]), Name1, Vsn1, + []), + App1 = ec_cnv:to_atom(Name1), + + Name2 = rebar_test_utils:create_random_name("app2_"), + Vsn2 = rebar_test_utils:create_random_vsn(), + rebar_test_utils:create_app(filename:join([AppDir,"deps",Name2]), Name2, Vsn2, + [App1]), % App2 depends on App1 + App2 = ec_cnv:to_atom(Name2), + + Name3 = rebar_test_utils:create_random_name("app3_"), % the project application + Vsn3 = rebar_test_utils:create_random_vsn(), + rebar_test_utils:create_app(AppDir, Name3, Vsn3, + [App2]), % App3 depends on App2 + + %% Dependencies settings + State1 = rebar_state:add_resource(State, {localfs, rebar_localfs_resource}), + Config1 = [{state, State1} | Config], + RebarConfig1 = merge_config( + [{deps, + [ + {App1, {localfs, filename:join([AppDir,"deps",Name1])}}, + {App2, {localfs, filename:join([AppDir,"deps",Name2])}} + ]}], + RebarConfig), + + %% Dialyzer: plt_apps = top_level_deps (default) + rebar_test_utils:run_and_check(Config1, RebarConfig1, ["dialyzer"], + {ok, [{app, Name3}]}), + + %% NOTE: `erts` is included in `base_plt_apps` + {ok, PltFiles1} = plt_files(Plt), + ?assertEqual([App2, erts], get_apps_from_beam_files(PltFiles1)), + + %% Dialyzer: plt_apps = all_deps + RebarConfig2 = merge_config([{dialyzer, [{plt_apps, all_deps}]}], + RebarConfig1), + rebar_test_utils:run_and_check(Config1, RebarConfig2, ["dialyzer"], + {ok, [{app, Name3}]}), + + {ok, PltFiles2} = plt_files(Plt), + ?assertEqual([App1, App2, erts], get_apps_from_beam_files(PltFiles2)). + %% Helpers erts_files() -> @@ -157,3 +210,19 @@ alter_plt(Plt) -> {init_plt, Plt}, {files, [code:which(dialyzer)]}]), ok. + +-spec merge_config(Config, Config) -> Config when + Config :: [{term(), term()}]. +merge_config(NewConfig, OldConfig) -> + dict:to_list( + rebar_opts:merge_opts(dict:from_list(NewConfig), + dict:from_list(OldConfig))). + +-spec get_apps_from_beam_files(string()) -> [atom()]. +get_apps_from_beam_files(BeamFiles) -> + lists:usort( + [begin + AppNameVsn = filename:basename(filename:dirname(filename:dirname(File))), + [AppName | _] = string:tokens(AppNameVsn ++ "-", "-"), + ec_cnv:to_atom(AppName) + end || File <- BeamFiles]). diff --git a/test/rebar_localfs_resource.erl b/test/rebar_localfs_resource.erl new file mode 100644 index 0000000..d60421e --- /dev/null +++ b/test/rebar_localfs_resource.erl @@ -0,0 +1,38 @@ +%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- +%% ex: ts=4 sw=4 et +%% +%% @doc A localfs custom resource (for testing purposes only) +%% +%% ``` +%% {deps, [ +%% %% Application files are copied from "/path/to/app_name" +%% {app_name, {localfs, "/path/to/app_name", undefined}} +%% ]}. +%% ''' +-module(rebar_localfs_resource). + +-behaviour(rebar_resource). + +-export([lock/2 + ,download/3 + ,needs_update/2 + ,make_vsn/1]). + +-include_lib("eunit/include/eunit.hrl"). + +lock(AppDir, {localfs, Path, _Ref}) -> + lock(AppDir, {localfs, Path}); +lock(_AppDir, {localfs, Path}) -> + {localfs, Path, undefined}. + +needs_update(_AppDir, _Resource) -> + false. + +download(AppDir, {localfs, Path, _Ref}, State) -> + download(AppDir, {localfs, Path}, State); +download(AppDir, {localfs, Path}, _State) -> + ok = rebar_file_utils:cp_r(filelib:wildcard(Path ++ "/*"), AppDir), + {ok, undefined}. + +make_vsn(_AppDir) -> + {plain, "undefined"}. |