diff options
56 files changed, 72 insertions, 71 deletions
diff --git a/ebin/rebar.app b/ebin/rebar.app index 9449e1e..b4c8b5a 100644 --- a/ebin/rebar.app +++ b/ebin/rebar.app @@ -55,7 +55,6 @@ stdlib, sasl, compiler, - crypto, syntax_tools, tools, eunit, diff --git a/inttest/app_src/app_src.erl b/inttest/app_src/app_src.erl index dec7307..a6c53d1 100644 --- a/inttest/app_src/app_src.erl +++ b/inttest/app_src/app_src.erl @@ -1,6 +1,6 @@ -module(app_src). --compile(export_all). +-export([test/0]). test() -> ok. diff --git a/inttest/app_src/app_src_rt.erl b/inttest/app_src/app_src_rt.erl index 2b5a87e..c8240d2 100644 --- a/inttest/app_src/app_src_rt.erl +++ b/inttest/app_src/app_src_rt.erl @@ -26,7 +26,7 @@ %% ------------------------------------------------------------------- -module(app_src_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). diff --git a/inttest/app_src_script/app_src_script.erl b/inttest/app_src_script/app_src_script.erl index 6372c92..3f2a19b 100644 --- a/inttest/app_src_script/app_src_script.erl +++ b/inttest/app_src_script/app_src_script.erl @@ -1,6 +1,6 @@ -module(app_src_script). --compile(export_all). +-export([test/0]). test() -> ok. diff --git a/inttest/app_src_script/app_src_script_rt.erl b/inttest/app_src_script/app_src_script_rt.erl index c0de128..377f929 100644 --- a/inttest/app_src_script/app_src_script_rt.erl +++ b/inttest/app_src_script/app_src_script_rt.erl @@ -26,7 +26,7 @@ %% ------------------------------------------------------------------- -module(app_src_script_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). diff --git a/inttest/app_src_script_2/app_src_script_2.erl b/inttest/app_src_script_2/app_src_script_2.erl index 26b8364..88eee51 100644 --- a/inttest/app_src_script_2/app_src_script_2.erl +++ b/inttest/app_src_script_2/app_src_script_2.erl @@ -1,6 +1,6 @@ -module(app_src_script_2). --compile(export_all). +-export([test/0]). test() -> ok. diff --git a/inttest/app_src_script_2/app_src_script_2_rt.erl b/inttest/app_src_script_2/app_src_script_2_rt.erl index 613e3f9..78cd761 100644 --- a/inttest/app_src_script_2/app_src_script_2_rt.erl +++ b/inttest/app_src_script_2/app_src_script_2_rt.erl @@ -26,7 +26,7 @@ %% ------------------------------------------------------------------- -module(app_src_script_2_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). diff --git a/inttest/appup_src/appup_src_rt.erl b/inttest/appup_src/appup_src_rt.erl index 7530aa4..0131972 100644 --- a/inttest/appup_src/appup_src_rt.erl +++ b/inttest/appup_src/appup_src_rt.erl @@ -26,7 +26,7 @@ %% ------------------------------------------------------------------- -module(appup_src_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). diff --git a/inttest/appup_src/src/appup_src.erl b/inttest/appup_src/src/appup_src.erl index 6f4d0d7..26b1812 100644 --- a/inttest/appup_src/src/appup_src.erl +++ b/inttest/appup_src/src/appup_src.erl @@ -1,6 +1,6 @@ -module(appup_src). --compile(export_all). +-export([test/0]). test() -> ok. diff --git a/inttest/appup_src_2/appup_src_2_rt.erl b/inttest/appup_src_2/appup_src_2_rt.erl index 99e6248..4b621b1 100644 --- a/inttest/appup_src_2/appup_src_2_rt.erl +++ b/inttest/appup_src_2/appup_src_2_rt.erl @@ -26,7 +26,7 @@ %% ------------------------------------------------------------------- -module(appup_src_2_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). diff --git a/inttest/appup_src_2/appup_src_rt_2.erl b/inttest/appup_src_2/appup_src_rt_2.erl index fff6f62..e855a96 100644 --- a/inttest/appup_src_2/appup_src_rt_2.erl +++ b/inttest/appup_src_2/appup_src_rt_2.erl @@ -26,7 +26,7 @@ %% ------------------------------------------------------------------- -module(appup_src_rt_2). --compile(export_all). +-export([setup/1, files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). diff --git a/inttest/appup_src_2/src/appup_src.erl b/inttest/appup_src_2/src/appup_src.erl index 6f4d0d7..26b1812 100644 --- a/inttest/appup_src_2/src/appup_src.erl +++ b/inttest/appup_src_2/src/appup_src.erl @@ -1,6 +1,6 @@ -module(appup_src). --compile(export_all). +-export([test/0]). test() -> ok. diff --git a/inttest/appup_src_script/appup_src_script_rt.erl b/inttest/appup_src_script/appup_src_script_rt.erl index 1aeb680..5dab165 100644 --- a/inttest/appup_src_script/appup_src_script_rt.erl +++ b/inttest/appup_src_script/appup_src_script_rt.erl @@ -26,7 +26,7 @@ %% ------------------------------------------------------------------- -module(appup_src_script_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). diff --git a/inttest/appup_src_script/src/appup_src.erl b/inttest/appup_src_script/src/appup_src.erl index 6f4d0d7..26b1812 100644 --- a/inttest/appup_src_script/src/appup_src.erl +++ b/inttest/appup_src_script/src/appup_src.erl @@ -1,6 +1,6 @@ -module(appup_src). --compile(export_all). +-export([test/0]). test() -> ok. diff --git a/inttest/bug_5_rt.erl b/inttest/bug_5_rt.erl index f198d40..7f00e4a 100644 --- a/inttest/bug_5_rt.erl +++ b/inttest/bug_5_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(bug_5_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/ct1/ct1_rt.erl b/inttest/ct1/ct1_rt.erl index 03b4ed8..97d77f9 100644 --- a/inttest/ct1/ct1_rt.erl +++ b/inttest/ct1/ct1_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(ct1_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/ct1/test_SUITE.erl b/inttest/ct1/test_SUITE.erl index e8a2bb8..3d86a6a 100644 --- a/inttest/ct1/test_SUITE.erl +++ b/inttest/ct1/test_SUITE.erl @@ -1,6 +1,6 @@ -module(test_SUITE). --compile(export_all). +-export([all/0, simple_test/1, app_config_file_test/1]). -include_lib("ct.hrl"). diff --git a/inttest/ct2/ct2_rt.erl b/inttest/ct2/ct2_rt.erl index b3138d4..06d7abb 100644 --- a/inttest/ct2/ct2_rt.erl +++ b/inttest/ct2/ct2_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(ct2_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/ct2/foo_SUITE.erl b/inttest/ct2/foo_SUITE.erl index d03aedf..be089c7 100644 --- a/inttest/ct2/foo_SUITE.erl +++ b/inttest/ct2/foo_SUITE.erl @@ -2,7 +2,7 @@ -include_lib("common_test/include/ct.hrl"). --compile(export_all). +-export([all/0, foo/1]). all() -> [foo]. diff --git a/inttest/ct3/ct3_rt.erl b/inttest/ct3/ct3_rt.erl index b5739db..32ded4c 100644 --- a/inttest/ct3/ct3_rt.erl +++ b/inttest/ct3/ct3_rt.erl @@ -26,7 +26,7 @@ %% ------------------------------------------------------------------- -module(ct3_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/ct3/test_SUITE.erl b/inttest/ct3/test_SUITE.erl index efd930d..610c14c 100644 --- a/inttest/ct3/test_SUITE.erl +++ b/inttest/ct3/test_SUITE.erl @@ -26,7 +26,7 @@ %% ------------------------------------------------------------------- -module(test_SUITE). --compile(export_all). +-export([all/0, simple_test/1, app_config_file_test/1, check_path/1]). -include_lib("ct.hrl"). diff --git a/inttest/ct4/ct4_rt.erl b/inttest/ct4/ct4_rt.erl index bc010e8..b393bc7 100644 --- a/inttest/ct4/ct4_rt.erl +++ b/inttest/ct4/ct4_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(ct4_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/ct4/foo_SUITE.erl b/inttest/ct4/foo_SUITE.erl index fb4f56a..931ca50 100644 --- a/inttest/ct4/foo_SUITE.erl +++ b/inttest/ct4/foo_SUITE.erl @@ -2,7 +2,7 @@ -include_lib("common_test/include/ct.hrl"). --compile(export_all). +-export([all/0, simple/1]). all() -> [simple]. diff --git a/inttest/ct_cover/ct_cover_rt.erl b/inttest/ct_cover/ct_cover_rt.erl index 361d85b..8bff9df 100644 --- a/inttest/ct_cover/ct_cover_rt.erl +++ b/inttest/ct_cover/ct_cover_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(ct_cover_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/ct_cover/mock/dummy/itest/test_SUITE.erl b/inttest/ct_cover/mock/dummy/itest/test_SUITE.erl index 0d9a065..25dde6a 100644 --- a/inttest/ct_cover/mock/dummy/itest/test_SUITE.erl +++ b/inttest/ct_cover/mock/dummy/itest/test_SUITE.erl @@ -1,6 +1,6 @@ -module(test_SUITE). --compile(export_all). +-export([all/0, simple_test/1, app_config_file_test/1]). -include_lib("ct.hrl"). diff --git a/inttest/ct_cover/test_SUITE.erl b/inttest/ct_cover/test_SUITE.erl index e8a2bb8..3d86a6a 100644 --- a/inttest/ct_cover/test_SUITE.erl +++ b/inttest/ct_cover/test_SUITE.erl @@ -1,6 +1,6 @@ -module(test_SUITE). --compile(export_all). +-export([all/0, simple_test/1, app_config_file_test/1]). -include_lib("ct.hrl"). diff --git a/inttest/ct_make_fails/ct_make_fails_rt.erl b/inttest/ct_make_fails/ct_make_fails_rt.erl index a7959a7..e2abb9a 100644 --- a/inttest/ct_make_fails/ct_make_fails_rt.erl +++ b/inttest/ct_make_fails/ct_make_fails_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(ct_make_fails_rt). --compile(export_all). +-export([files/0, run/1]). files() -> diff --git a/inttest/ct_make_fails/test_SUITE.erl b/inttest/ct_make_fails/test_SUITE.erl index 343aa5a..068e926 100644 --- a/inttest/ct_make_fails/test_SUITE.erl +++ b/inttest/ct_make_fails/test_SUITE.erl @@ -1,6 +1,6 @@ -module(test_SUITE). --compile(export_all). +-export([all/0, simple_test/1, app_config_file_test/1]). -include_lib("ct.hrl"). diff --git a/inttest/ct_test_fails/ct_test_fails_rt.erl b/inttest/ct_test_fails/ct_test_fails_rt.erl index a556891..69ee382 100644 --- a/inttest/ct_test_fails/ct_test_fails_rt.erl +++ b/inttest/ct_test_fails/ct_test_fails_rt.erl @@ -2,8 +2,7 @@ %% ex: ts=4 sw=4 et -module(ct_test_fails_rt). --compile(export_all). - +-export([files/0, run/1]). files() -> [{create, "ebin/a1.app", app(a1)}, @@ -14,11 +13,11 @@ files() -> {copy, "test_SUITE.erl", "itest/test_SUITE.erl"}, {copy, "test2_SUITE.erl", "itest/test2_SUITE.erl"}]. -run(Dir) -> +run(_Dir) -> ok = case catch retest:sh("./rebar compile ct -v 3") of - {error, {stopped, _}} -> ok; - _ -> expected_to_fail - end. + {error, {stopped, _}} -> ok; + _ -> expected_to_fail + end. %% %% Generate the contents of a simple .app file diff --git a/inttest/ct_test_fails/test2_SUITE.erl b/inttest/ct_test_fails/test2_SUITE.erl index 4b9299f..7db1d22 100644 --- a/inttest/ct_test_fails/test2_SUITE.erl +++ b/inttest/ct_test_fails/test2_SUITE.erl @@ -1,6 +1,6 @@ -module(test2_SUITE). --compile(export_all). +-export([all/0, simple_test/1]). all() -> [simple_test]. diff --git a/inttest/ct_test_fails/test_SUITE.erl b/inttest/ct_test_fails/test_SUITE.erl index 124fbe8..047631c 100644 --- a/inttest/ct_test_fails/test_SUITE.erl +++ b/inttest/ct_test_fails/test_SUITE.erl @@ -1,6 +1,6 @@ -module(test_SUITE). --compile(export_all). +-export([all/0, simple_test/1]). all() -> [simple_test]. diff --git a/inttest/depplugins/depplugins_rt.erl b/inttest/depplugins/depplugins_rt.erl index fc72dec..c2cb76a 100644 --- a/inttest/depplugins/depplugins_rt.erl +++ b/inttest/depplugins/depplugins_rt.erl @@ -17,7 +17,7 @@ %%% </ol> -module(depplugins_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). diff --git a/inttest/inttest_utils.erl b/inttest/inttest_utils.erl index d896f4d..addac5f 100644 --- a/inttest/inttest_utils.erl +++ b/inttest/inttest_utils.erl @@ -2,7 +2,10 @@ %% ex: ts=4 sw=4 et -module(inttest_utils). --compile(export_all). +-export([ rebar_setup/1 + , rebar_setup/2 + , rebar_setup/0 + ]). rebar_setup({win32, nt}, Dir) -> [{copy, filename:join(Dir, "rebar.cmd"), "rebar.cmd"}]; diff --git a/inttest/neotoma1/neotoma_src_rt.erl b/inttest/neotoma1/neotoma_src_rt.erl index 6f7c6ff..568bc31 100644 --- a/inttest/neotoma1/neotoma_src_rt.erl +++ b/inttest/neotoma1/neotoma_src_rt.erl @@ -26,7 +26,7 @@ %% ------------------------------------------------------------------- -module(neotoma_src_rt). --compile(export_all). +-export([files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). -include_lib("deps/retest/include/retest.hrl"). diff --git a/inttest/rebar3_deps1/a.erl b/inttest/rebar3_deps1/a.erl index 835522a..897b963 100644 --- a/inttest/rebar3_deps1/a.erl +++ b/inttest/rebar3_deps1/a.erl @@ -1,6 +1,6 @@ -module(a). --compile(export_all). +-export([hello/0]). -include_lib("b/include/b.hrl"). diff --git a/inttest/rebar3_deps1/rebar3_deps1_rt.erl b/inttest/rebar3_deps1/rebar3_deps1_rt.erl index e84b6ba..92a1628 100644 --- a/inttest/rebar3_deps1/rebar3_deps1_rt.erl +++ b/inttest/rebar3_deps1/rebar3_deps1_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(rebar3_deps1_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/rgen1/rgen1_rt.erl b/inttest/rgen1/rgen1_rt.erl index 5847f4a..7641ca4 100644 --- a/inttest/rgen1/rgen1_rt.erl +++ b/inttest/rgen1/rgen1_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(rgen1_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). %% Exercise release generation w/ templating diff --git a/inttest/t_custom_config/custom_config.erl b/inttest/t_custom_config/custom_config.erl index 8656201..de964b4 100644 --- a/inttest/t_custom_config/custom_config.erl +++ b/inttest/t_custom_config/custom_config.erl @@ -1,6 +1,6 @@ -module(custom_config). --compile(export_all). +-export([test/0]). test() -> ok. diff --git a/inttest/t_custom_config/t_custom_config_rt.erl b/inttest/t_custom_config/t_custom_config_rt.erl index 1f21927..bda229e 100644 --- a/inttest/t_custom_config/t_custom_config_rt.erl +++ b/inttest/t_custom_config/t_custom_config_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(t_custom_config_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). diff --git a/inttest/tdeps1/a.erl b/inttest/tdeps1/a.erl index 835522a..897b963 100644 --- a/inttest/tdeps1/a.erl +++ b/inttest/tdeps1/a.erl @@ -1,6 +1,6 @@ -module(a). --compile(export_all). +-export([hello/0]). -include_lib("b/include/b.hrl"). diff --git a/inttest/tdeps1/tdeps1_rt.erl b/inttest/tdeps1/tdeps1_rt.erl index 849403b..b291b54 100644 --- a/inttest/tdeps1/tdeps1_rt.erl +++ b/inttest/tdeps1/tdeps1_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(tdeps1_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/tdeps2/tdeps2_rt.erl b/inttest/tdeps2/tdeps2_rt.erl index a5665ad..33a8c15 100644 --- a/inttest/tdeps2/tdeps2_rt.erl +++ b/inttest/tdeps2/tdeps2_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(tdeps2_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/tdeps3/tdeps3_rt.erl b/inttest/tdeps3/tdeps3_rt.erl index bc47772..e30b64e 100644 --- a/inttest/tdeps3/tdeps3_rt.erl +++ b/inttest/tdeps3/tdeps3_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(tdeps3_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/tdeps_prefer/tdeps_prefer_rt.erl b/inttest/tdeps_prefer/tdeps_prefer_rt.erl index 94c9b8f..aca0b96 100644 --- a/inttest/tdeps_prefer/tdeps_prefer_rt.erl +++ b/inttest/tdeps_prefer/tdeps_prefer_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(tdeps_prefer_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/tdeps_update/tdeps_update_rt.erl b/inttest/tdeps_update/tdeps_update_rt.erl index b4919c5..2710534 100644 --- a/inttest/tdeps_update/tdeps_update_rt.erl +++ b/inttest/tdeps_update/tdeps_update_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(tdeps_update_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/thooks/fish.erl b/inttest/thooks/fish.erl index 739cb94..f22194a 100644 --- a/inttest/thooks/fish.erl +++ b/inttest/thooks/fish.erl @@ -1,5 +1,5 @@ -module(fish). --compile(export_all). +-export([fish/0]). fish() -> fish. diff --git a/inttest/thooks/thooks_rt.erl b/inttest/thooks/thooks_rt.erl index f1e7fa4..5501323 100644 --- a/inttest/thooks/thooks_rt.erl +++ b/inttest/thooks/thooks_rt.erl @@ -3,7 +3,7 @@ -module(thooks_rt). -include_lib("eunit/include/eunit.hrl"). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/inttest/tplugins/bad_plugin.erl b/inttest/tplugins/bad_plugin.erl index 77ec01b..5730a6d 100644 --- a/inttest/tplugins/bad_plugin.erl +++ b/inttest/tplugins/bad_plugin.erl @@ -1,5 +1,6 @@ -module(bad_plugin). --compile(export_all). + +-export([fwibble/2]). %% this plugin contains numerous DELIBERATE syntax errors diff --git a/inttest/tplugins/fish.erl b/inttest/tplugins/fish.erl index 739cb94..aa0639d 100644 --- a/inttest/tplugins/fish.erl +++ b/inttest/tplugins/fish.erl @@ -1,5 +1,5 @@ -module(fish). --compile(export_all). +-expoort([fish/0]). fish() -> fish. diff --git a/inttest/tplugins/test_plugin.erl b/inttest/tplugins/test_plugin.erl index 461247c..5b8494f 100644 --- a/inttest/tplugins/test_plugin.erl +++ b/inttest/tplugins/test_plugin.erl @@ -1,5 +1,6 @@ -module(test_plugin). --compile(export_all). + +-export([fwibble/2]). fwibble(Config, _) -> Pwd = rebar_utils:get_cwd(), diff --git a/inttest/tplugins/tplugins_rt.erl b/inttest/tplugins/tplugins_rt.erl index d36afdd..c833f62 100644 --- a/inttest/tplugins/tplugins_rt.erl +++ b/inttest/tplugins/tplugins_rt.erl @@ -1,7 +1,7 @@ %% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ts=4 sw=4 et -module(tplugins_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). -include_lib("eunit/include/eunit.hrl"). diff --git a/inttest/vsn_cache/vsn_cache_rt.erl b/inttest/vsn_cache/vsn_cache_rt.erl index b482888..18c98ab 100644 --- a/inttest/vsn_cache/vsn_cache_rt.erl +++ b/inttest/vsn_cache/vsn_cache_rt.erl @@ -2,7 +2,7 @@ %% ex: ts=4 sw=4 et -module(vsn_cache_rt). --compile(export_all). +-export([setup/1, files/0, run/1]). setup([Target]) -> retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), diff --git a/rebar.config b/rebar.config index eda5a2c..6765415 100644 --- a/rebar.config +++ b/rebar.config @@ -32,7 +32,8 @@ - (\"diameter_dict_util\":\"parse\"/\"2\") - (\"erlang\":\"timestamp\"/\"0\") - (\"rebar_rnd\":\"seed\"/\"1\") - - (\"rebar_rnd\":\"uniform\"/\"0\"))", + - (\"rebar_rnd\":\"uniform\"/\"0\") + - (\"rebar_rnd\":\"uniform\"/\"1\"))", []}]}. {dialyzer, diff --git a/src/rebar.erl b/src/rebar.erl index 6f78fe6..c87e591 100644 --- a/src/rebar.erl +++ b/src/rebar.erl @@ -156,9 +156,6 @@ init_config1(BaseConfig) -> rebar_config:set_xconf(BaseConfig1, base_dir, AbsCwd). profile(BaseConfig1, Commands) -> - ?CONSOLE("Please take note that profiler=[fprof|eflame] is preliminary" - " and will be~nreplaced with a different command line flag" - " in the next release.~n", []), Profiler = rebar_config:get_global(BaseConfig1, profiler, "fprof"), profile(BaseConfig1, Commands, list_to_atom(Profiler)). @@ -208,12 +205,6 @@ profile(_Config, _Commands, Profiler) -> ?ABORT("Unsupported profiler: ~s~n", [Profiler]). run_aux(BaseConfig, Commands) -> - %% Make sure crypto is running - case crypto:start() of - ok -> ok; - {error,{already_started,crypto}} -> ok - end, - %% Make sure memoization server is running case rmemo:start() of {ok, _} -> ok; diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl index b27f661..892ae03 100644 --- a/src/rebar_ct.erl +++ b/src/rebar_ct.erl @@ -237,6 +237,7 @@ make_cmd(TestDir, RawLogDir, Config) -> CodeDirs = [io_lib:format("\"~s\"", [Dir]) || Dir <- [EbinDir|NonLibCodeDirs]], CodePathString = string:join(CodeDirs, " "), + _ = rebar_rnd:seed({55, seconds(), 7331}), Cmd = case get_ct_specs(Config, search_ct_specs_from(Cwd, TestDir, Config)) of undefined -> ?FMT("~s" @@ -285,13 +286,18 @@ search_ct_specs_from(Cwd, TestDir, Config) -> Cwd end. +seconds() -> + calendar:datetime_to_gregorian_seconds(calendar:universal_time()). + build_name(Config) -> %% generate a unique name for our test node, we want %% to make sure the odds of name clashing are low - Random = integer_to_list(crypto:rand_uniform(0, 10000)), + Secs = integer_to_list(seconds()), + Random = integer_to_list(rebar_rnd:uniform(1000000)), + PseudoUnique = Random ++ "N" ++ Secs, case rebar_config:get_local(Config, ct_use_short_names, false) of - true -> "-sname test" ++ Random; - false -> " -name test" ++ Random ++ "@" ++ net_adm:localhost() + true -> "-sname test" ++ PseudoUnique; + false -> " -name test" ++ PseudoUnique ++ "@" ++ net_adm:localhost() end. get_extra_params(Config) -> diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl index ebf76bc..538f88b 100644 --- a/src/rebar_eunit.erl +++ b/src/rebar_eunit.erl @@ -279,7 +279,7 @@ randomize_suites(Config, Modules) -> undefined -> Modules; "true" -> - Seed = crypto:rand_uniform(1, 65535), + Seed = rebar_rnd:uniform(65535), randomize_suites1(Modules, Seed); String -> try list_to_integer(String) of |