From 21f47438614a0d50caf20801c4440d54d12c3f20 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 30 Aug 2014 22:14:48 -0500 Subject: remove more code that can be brought back later if needed --- inttest/bug_5_rt.erl | 29 ---- .../code_path_no_recurse_rt.erl | 19 --- .../deps/bazdep/src/bazdep.app.src | 12 -- .../deps/bazdep/src/bazdep.erl | 6 - .../deps/bazdep/test/bazdep_tests.erl | 5 - .../code_path_no_recurse/deps/foodep/rebar.config | 1 - .../deps/foodep/src/foodep.app.src | 12 -- .../deps/foodep/src/foodep.erl | 6 - .../deps/foodep/test/foodep_tests.erl | 5 - .../deps/unuseddep/src/unuseddep.app.src | 12 -- .../deps/unuseddep/src/unuseddep.erl | 6 - inttest/code_path_no_recurse/rebar.config | 1 - inttest/code_path_no_recurse/src/codepath.app.src | 12 -- inttest/code_path_no_recurse/src/codepath.erl | 6 - .../code_path_no_recurse/test/codepath_tests.erl | 12 -- inttest/ct1/app.config | 2 - inttest/ct1/ct1_rt.erl | 30 ----- inttest/ct1/rebar.config | 2 - inttest/ct1/test_SUITE.erl | 17 --- inttest/ct2/ct2_rt.erl | 26 ---- inttest/ct2/foo.test.spec | 1 - inttest/ct2/foo_SUITE.erl | 10 -- inttest/depplugins/base_dir_cwd_plugin.erl | 7 - inttest/depplugins/dep_cwd_plugin.erl | 7 - inttest/depplugins/depplugins_rt.erl | 69 ---------- inttest/depplugins/rebar.config | 2 - inttest/depplugins/rebar_dependsonplugin.config | 2 - inttest/depplugins/rebar_testplugin.config | 1 - inttest/depplugins/testplugin_mod.erl | 7 - inttest/erlc/asn1/SIMPLE-ASN.asn1 | 7 - inttest/erlc/erlc_rt.erl | 137 ------------------- inttest/erlc/extra-include/foo_extra.hrl | 3 - inttest/erlc/extra-src/foo_sup.erl | 15 --- inttest/erlc/foobar.erl | 8 -- inttest/erlc/include/foo_core.hrl | 3 - inttest/erlc/mibs/SIMPLE-MIB.mib | 26 ---- inttest/erlc/rebar-no_debug_info.config | 11 -- inttest/erlc/rebar.config | 13 -- inttest/erlc/src/._do_not_compile.erl | 4 - inttest/erlc/src/behaviour/foo_worker.erl | 14 -- inttest/erlc/src/first_erl.erl | 10 -- inttest/erlc/src/first_xrl.xrl | 13 -- inttest/erlc/src/first_yrl.yrl | 9 -- inttest/erlc/src/foo.erl | 35 ----- inttest/erlc/src/foo_app.erl | 10 -- inttest/erlc/src/foo_test_worker.erl | 34 ----- inttest/eunit/eunit_rt.erl | 48 ------- inttest/eunit/eunit_src/bar.erl | 6 - inttest/eunit/rebar-eunit_compile_opts.config | 1 - inttest/eunit/src/foo.erl | 10 -- inttest/logging/logging_rt.erl | 99 -------------- inttest/rgen1/reltool.config | 31 ----- inttest/rgen1/retest.config | 1 - inttest/rgen1/rgen1_rt.erl | 18 --- inttest/rgen1/test.config | 1 - inttest/rgen1/vars.config | 1 - inttest/t_custom_config/custom.config | 4 - inttest/t_custom_config/custom_config.erl | 6 - inttest/t_custom_config/t_custom_config_rt.erl | 39 ------ inttest/tdeps1/a.erl | 8 -- inttest/tdeps1/a.rebar.config | 1 - inttest/tdeps1/b.hrl | 1 - inttest/tdeps1/b.rebar.config | 1 - inttest/tdeps1/c.hrl | 1 - inttest/tdeps1/tdeps1_rt.erl | 60 --------- inttest/tdeps2/a.erl | 3 - inttest/tdeps2/a.rebar.config | 1 - inttest/tdeps2/b.hrl | 1 - inttest/tdeps2/b.rebar.config | 1 - inttest/tdeps2/c.hrl | 1 - inttest/tdeps2/root.rebar.config | 2 - inttest/tdeps2/tdeps2_rt.erl | 66 --------- inttest/tdeps3/a.erl | 3 - inttest/tdeps3/a.rebar.config | 4 - inttest/tdeps3/b.hrl | 1 - inttest/tdeps3/b.rebar.config | 5 - inttest/tdeps3/c.hrl | 1 - inttest/tdeps3/c.rebar.config | 1 - inttest/tdeps3/d.hrl | 1 - inttest/tdeps3/d.rebar.config | 1 - inttest/tdeps3/e.hrl | 1 - inttest/tdeps3/f.hrl | 1 - inttest/tdeps3/root.rebar.config | 1 - inttest/tdeps3/tdeps3_rt.erl | 89 ------------- inttest/tdeps_update/a.erl | 3 - inttest/tdeps_update/a.rebar.config | 1 - inttest/tdeps_update/a2.rebar.config | 1 - inttest/tdeps_update/a3.rebar.config | 1 - inttest/tdeps_update/a4.rebar.config | 4 - inttest/tdeps_update/b.hrl | 1 - inttest/tdeps_update/b.rebar.config | 1 - inttest/tdeps_update/b2.rebar.config | 1 - inttest/tdeps_update/b3.rebar.config | 1 - inttest/tdeps_update/b4.rebar.config | 1 - inttest/tdeps_update/c.hrl | 1 - inttest/tdeps_update/c.rebar.config | 1 - inttest/tdeps_update/c2.hrl | 1 - inttest/tdeps_update/c2.rebar.config | 4 - inttest/tdeps_update/c3.rebar.config | 4 - inttest/tdeps_update/d.hrl | 1 - inttest/tdeps_update/root.rebar.config | 1 - inttest/tdeps_update/tdeps_update_rt.erl | 148 --------------------- inttest/thooks/fish.erl | 5 - inttest/thooks/rebar.config | 7 - inttest/thooks/thooks_rt.erl | 40 ------ inttest/tplugins/bad.config | 2 - inttest/tplugins/bad_plugin.erl | 7 - inttest/tplugins/fish.erl | 5 - inttest/tplugins/rebar.config | 1 - inttest/tplugins/test_plugin.erl | 8 -- inttest/tplugins/tplugins_rt.erl | 40 ------ 111 files changed, 1491 deletions(-) delete mode 100644 inttest/bug_5_rt.erl delete mode 100644 inttest/code_path_no_recurse/code_path_no_recurse_rt.erl delete mode 100644 inttest/code_path_no_recurse/deps/bazdep/src/bazdep.app.src delete mode 100644 inttest/code_path_no_recurse/deps/bazdep/src/bazdep.erl delete mode 100644 inttest/code_path_no_recurse/deps/bazdep/test/bazdep_tests.erl delete mode 100644 inttest/code_path_no_recurse/deps/foodep/rebar.config delete mode 100644 inttest/code_path_no_recurse/deps/foodep/src/foodep.app.src delete mode 100644 inttest/code_path_no_recurse/deps/foodep/src/foodep.erl delete mode 100644 inttest/code_path_no_recurse/deps/foodep/test/foodep_tests.erl delete mode 100644 inttest/code_path_no_recurse/deps/unuseddep/src/unuseddep.app.src delete mode 100644 inttest/code_path_no_recurse/deps/unuseddep/src/unuseddep.erl delete mode 100644 inttest/code_path_no_recurse/rebar.config delete mode 100644 inttest/code_path_no_recurse/src/codepath.app.src delete mode 100644 inttest/code_path_no_recurse/src/codepath.erl delete mode 100644 inttest/code_path_no_recurse/test/codepath_tests.erl delete mode 100644 inttest/ct1/app.config delete mode 100644 inttest/ct1/ct1_rt.erl delete mode 100644 inttest/ct1/rebar.config delete mode 100644 inttest/ct1/test_SUITE.erl delete mode 100644 inttest/ct2/ct2_rt.erl delete mode 100644 inttest/ct2/foo.test.spec delete mode 100644 inttest/ct2/foo_SUITE.erl delete mode 100644 inttest/depplugins/base_dir_cwd_plugin.erl delete mode 100644 inttest/depplugins/dep_cwd_plugin.erl delete mode 100644 inttest/depplugins/depplugins_rt.erl delete mode 100644 inttest/depplugins/rebar.config delete mode 100644 inttest/depplugins/rebar_dependsonplugin.config delete mode 100644 inttest/depplugins/rebar_testplugin.config delete mode 100644 inttest/depplugins/testplugin_mod.erl delete mode 100644 inttest/erlc/asn1/SIMPLE-ASN.asn1 delete mode 100644 inttest/erlc/erlc_rt.erl delete mode 100644 inttest/erlc/extra-include/foo_extra.hrl delete mode 100644 inttest/erlc/extra-src/foo_sup.erl delete mode 100644 inttest/erlc/foobar.erl delete mode 100644 inttest/erlc/include/foo_core.hrl delete mode 100644 inttest/erlc/mibs/SIMPLE-MIB.mib delete mode 100644 inttest/erlc/rebar-no_debug_info.config delete mode 100644 inttest/erlc/rebar.config delete mode 100644 inttest/erlc/src/._do_not_compile.erl delete mode 100644 inttest/erlc/src/behaviour/foo_worker.erl delete mode 100644 inttest/erlc/src/first_erl.erl delete mode 100644 inttest/erlc/src/first_xrl.xrl delete mode 100644 inttest/erlc/src/first_yrl.yrl delete mode 100644 inttest/erlc/src/foo.erl delete mode 100644 inttest/erlc/src/foo_app.erl delete mode 100644 inttest/erlc/src/foo_test_worker.erl delete mode 100644 inttest/eunit/eunit_rt.erl delete mode 100644 inttest/eunit/eunit_src/bar.erl delete mode 100644 inttest/eunit/rebar-eunit_compile_opts.config delete mode 100644 inttest/eunit/src/foo.erl delete mode 100644 inttest/logging/logging_rt.erl delete mode 100644 inttest/rgen1/reltool.config delete mode 100644 inttest/rgen1/retest.config delete mode 100644 inttest/rgen1/rgen1_rt.erl delete mode 100644 inttest/rgen1/test.config delete mode 100644 inttest/rgen1/vars.config delete mode 100644 inttest/t_custom_config/custom.config delete mode 100644 inttest/t_custom_config/custom_config.erl delete mode 100644 inttest/t_custom_config/t_custom_config_rt.erl delete mode 100644 inttest/tdeps1/a.erl delete mode 100644 inttest/tdeps1/a.rebar.config delete mode 100644 inttest/tdeps1/b.hrl delete mode 100644 inttest/tdeps1/b.rebar.config delete mode 100644 inttest/tdeps1/c.hrl delete mode 100644 inttest/tdeps1/tdeps1_rt.erl delete mode 100644 inttest/tdeps2/a.erl delete mode 100644 inttest/tdeps2/a.rebar.config delete mode 100644 inttest/tdeps2/b.hrl delete mode 100644 inttest/tdeps2/b.rebar.config delete mode 100644 inttest/tdeps2/c.hrl delete mode 100644 inttest/tdeps2/root.rebar.config delete mode 100644 inttest/tdeps2/tdeps2_rt.erl delete mode 100644 inttest/tdeps3/a.erl delete mode 100644 inttest/tdeps3/a.rebar.config delete mode 100644 inttest/tdeps3/b.hrl delete mode 100644 inttest/tdeps3/b.rebar.config delete mode 100644 inttest/tdeps3/c.hrl delete mode 100644 inttest/tdeps3/c.rebar.config delete mode 100644 inttest/tdeps3/d.hrl delete mode 100644 inttest/tdeps3/d.rebar.config delete mode 100644 inttest/tdeps3/e.hrl delete mode 100644 inttest/tdeps3/f.hrl delete mode 100644 inttest/tdeps3/root.rebar.config delete mode 100644 inttest/tdeps3/tdeps3_rt.erl delete mode 100644 inttest/tdeps_update/a.erl delete mode 100644 inttest/tdeps_update/a.rebar.config delete mode 100644 inttest/tdeps_update/a2.rebar.config delete mode 100644 inttest/tdeps_update/a3.rebar.config delete mode 100644 inttest/tdeps_update/a4.rebar.config delete mode 100644 inttest/tdeps_update/b.hrl delete mode 100644 inttest/tdeps_update/b.rebar.config delete mode 100644 inttest/tdeps_update/b2.rebar.config delete mode 100644 inttest/tdeps_update/b3.rebar.config delete mode 100644 inttest/tdeps_update/b4.rebar.config delete mode 100644 inttest/tdeps_update/c.hrl delete mode 100644 inttest/tdeps_update/c.rebar.config delete mode 100644 inttest/tdeps_update/c2.hrl delete mode 100644 inttest/tdeps_update/c2.rebar.config delete mode 100644 inttest/tdeps_update/c3.rebar.config delete mode 100644 inttest/tdeps_update/d.hrl delete mode 100644 inttest/tdeps_update/root.rebar.config delete mode 100644 inttest/tdeps_update/tdeps_update_rt.erl delete mode 100644 inttest/thooks/fish.erl delete mode 100644 inttest/thooks/rebar.config delete mode 100644 inttest/thooks/thooks_rt.erl delete mode 100644 inttest/tplugins/bad.config delete mode 100644 inttest/tplugins/bad_plugin.erl delete mode 100644 inttest/tplugins/fish.erl delete mode 100644 inttest/tplugins/rebar.config delete mode 100644 inttest/tplugins/test_plugin.erl delete mode 100644 inttest/tplugins/tplugins_rt.erl (limited to 'inttest') diff --git a/inttest/bug_5_rt.erl b/inttest/bug_5_rt.erl deleted file mode 100644 index a06b693..0000000 --- a/inttest/bug_5_rt.erl +++ /dev/null @@ -1,29 +0,0 @@ --module(bug_5_rt). - --compile(export_all). - - -files() -> - [{create, "ebin/a1.app", app(a1)}, - {create, "deps/d1/src/d1.app.src", app(d1)}, - {create, "rebar.config", - <<"{deps, [{d1, \"1\", {hg, \"http://example.com\", \"tip\"}}]}.\n">>}, - {copy, "../rebar", "rebar"}]. - -run(_Dir) -> - {ok, _} = retest:sh("./rebar compile"), - ok. - - - -%% -%% Generate the contents of a simple .app file -%% -app(Name) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, []}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/code_path_no_recurse/code_path_no_recurse_rt.erl b/inttest/code_path_no_recurse/code_path_no_recurse_rt.erl deleted file mode 100644 index d884bcc..0000000 --- a/inttest/code_path_no_recurse/code_path_no_recurse_rt.erl +++ /dev/null @@ -1,19 +0,0 @@ --module(code_path_no_recurse_rt). --export([files/0, - run/1]). - -files() -> - [ - {copy, "../../rebar", "rebar"}, - {copy, "rebar.config", "rebar.config"}, - {copy, "src", "src"}, - {copy, "test", "test"}, - {copy, "deps", "deps"} - ]. - -run(_Dir) -> - retest:log(info, "Compile project~n"), - {ok, _} = retest:sh("./rebar -v compile"), - retest:log(info, "Run eunit with referenced deps on the code path~n"), - {ok, _} = retest:sh("./rebar -v eunit"), - ok. diff --git a/inttest/code_path_no_recurse/deps/bazdep/src/bazdep.app.src b/inttest/code_path_no_recurse/deps/bazdep/src/bazdep.app.src deleted file mode 100644 index 7f7b3f9..0000000 --- a/inttest/code_path_no_recurse/deps/bazdep/src/bazdep.app.src +++ /dev/null @@ -1,12 +0,0 @@ -{application, bazdep, - [ - {description, ""}, - {vsn, "1"}, - {registered, []}, - {applications, [ - kernel, - stdlib - ]}, - {mod, {bazdep, []}}, - {env, []} - ]}. diff --git a/inttest/code_path_no_recurse/deps/bazdep/src/bazdep.erl b/inttest/code_path_no_recurse/deps/bazdep/src/bazdep.erl deleted file mode 100644 index aef4cf3..0000000 --- a/inttest/code_path_no_recurse/deps/bazdep/src/bazdep.erl +++ /dev/null @@ -1,6 +0,0 @@ --module(bazdep). - --export([bazdep/0]). - -bazdep() -> - bazdep. diff --git a/inttest/code_path_no_recurse/deps/bazdep/test/bazdep_tests.erl b/inttest/code_path_no_recurse/deps/bazdep/test/bazdep_tests.erl deleted file mode 100644 index b5190f6..0000000 --- a/inttest/code_path_no_recurse/deps/bazdep/test/bazdep_tests.erl +++ /dev/null @@ -1,5 +0,0 @@ --module(bazdep_tests). --include_lib("eunit/include/eunit.hrl"). - -bazdep_test() -> - ?assert(bazdep:bazdep() =:= bazdep). diff --git a/inttest/code_path_no_recurse/deps/foodep/rebar.config b/inttest/code_path_no_recurse/deps/foodep/rebar.config deleted file mode 100644 index cdaf168..0000000 --- a/inttest/code_path_no_recurse/deps/foodep/rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{bazdep, "1"}]}. diff --git a/inttest/code_path_no_recurse/deps/foodep/src/foodep.app.src b/inttest/code_path_no_recurse/deps/foodep/src/foodep.app.src deleted file mode 100644 index c0642fb..0000000 --- a/inttest/code_path_no_recurse/deps/foodep/src/foodep.app.src +++ /dev/null @@ -1,12 +0,0 @@ -{application, foodep, - [ - {description, ""}, - {vsn, "1"}, - {registered, []}, - {applications, [ - kernel, - stdlib - ]}, - {mod, {foodep, []}}, - {env, []} - ]}. diff --git a/inttest/code_path_no_recurse/deps/foodep/src/foodep.erl b/inttest/code_path_no_recurse/deps/foodep/src/foodep.erl deleted file mode 100644 index 3d43d0e..0000000 --- a/inttest/code_path_no_recurse/deps/foodep/src/foodep.erl +++ /dev/null @@ -1,6 +0,0 @@ --module(foodep). - --export([foodep/0]). - -foodep() -> - bazdep:bazdep() =:= bazdep. diff --git a/inttest/code_path_no_recurse/deps/foodep/test/foodep_tests.erl b/inttest/code_path_no_recurse/deps/foodep/test/foodep_tests.erl deleted file mode 100644 index 66d7b8b..0000000 --- a/inttest/code_path_no_recurse/deps/foodep/test/foodep_tests.erl +++ /dev/null @@ -1,5 +0,0 @@ --module(foodep_tests). --include_lib("eunit/include/eunit.hrl"). - -foodep_test() -> - ?assert(foodep:foodep()). diff --git a/inttest/code_path_no_recurse/deps/unuseddep/src/unuseddep.app.src b/inttest/code_path_no_recurse/deps/unuseddep/src/unuseddep.app.src deleted file mode 100644 index d0bc233..0000000 --- a/inttest/code_path_no_recurse/deps/unuseddep/src/unuseddep.app.src +++ /dev/null @@ -1,12 +0,0 @@ -{application, unuseddep, - [ - {description, ""}, - {vsn, "1"}, - {registered, []}, - {applications, [ - kernel, - stdlib - ]}, - {mod, {unuseddep, []}}, - {env, []} - ]}. diff --git a/inttest/code_path_no_recurse/deps/unuseddep/src/unuseddep.erl b/inttest/code_path_no_recurse/deps/unuseddep/src/unuseddep.erl deleted file mode 100644 index a990345..0000000 --- a/inttest/code_path_no_recurse/deps/unuseddep/src/unuseddep.erl +++ /dev/null @@ -1,6 +0,0 @@ --module(unuseddep). - --export([unuseddep/0]). - -unuseddep() -> - unuseddep. diff --git a/inttest/code_path_no_recurse/rebar.config b/inttest/code_path_no_recurse/rebar.config deleted file mode 100644 index 4b358de..0000000 --- a/inttest/code_path_no_recurse/rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{foodep, "1"}]}. diff --git a/inttest/code_path_no_recurse/src/codepath.app.src b/inttest/code_path_no_recurse/src/codepath.app.src deleted file mode 100644 index 3aa200f..0000000 --- a/inttest/code_path_no_recurse/src/codepath.app.src +++ /dev/null @@ -1,12 +0,0 @@ -{application, codepath, - [ - {description, ""}, - {vsn, "1"}, - {registered, []}, - {applications, [ - kernel, - stdlib - ]}, - {mod, {codepath, []}}, - {env, []} - ]}. diff --git a/inttest/code_path_no_recurse/src/codepath.erl b/inttest/code_path_no_recurse/src/codepath.erl deleted file mode 100644 index df4e6b0..0000000 --- a/inttest/code_path_no_recurse/src/codepath.erl +++ /dev/null @@ -1,6 +0,0 @@ --module(codepath). - --export([codepath/0]). - -codepath() -> - foodep:foodep(). diff --git a/inttest/code_path_no_recurse/test/codepath_tests.erl b/inttest/code_path_no_recurse/test/codepath_tests.erl deleted file mode 100644 index 01a1d2a..0000000 --- a/inttest/code_path_no_recurse/test/codepath_tests.erl +++ /dev/null @@ -1,12 +0,0 @@ --module(codepath_tests). --include_lib("eunit/include/eunit.hrl"). - -codepath_test() -> - ?assertEqual({module, codepath}, code:ensure_loaded(codepath)), - ?assertEqual({module, foodep}, code:ensure_loaded(foodep)), - ?assertEqual({module, bazdep}, code:ensure_loaded(bazdep)), - ?assert(codepath:codepath()). - -unuseddep_test() -> - ?assertEqual(non_existing, code:which(unuseddep)), - ?assertEqual({error, nofile}, code:ensure_loaded(unuseddep)). diff --git a/inttest/ct1/app.config b/inttest/ct1/app.config deleted file mode 100644 index bb718b2..0000000 --- a/inttest/ct1/app.config +++ /dev/null @@ -1,2 +0,0 @@ -%% This file is an application config file, not a CT test config file -[{a1, [{foo, bar}]}]. diff --git a/inttest/ct1/ct1_rt.erl b/inttest/ct1/ct1_rt.erl deleted file mode 100644 index f9de372..0000000 --- a/inttest/ct1/ct1_rt.erl +++ /dev/null @@ -1,30 +0,0 @@ --module(ct1_rt). - --compile(export_all). - - -files() -> - [{create, "ebin/a1.app", app(a1)}, - {copy, "../../rebar", "rebar"}, - {copy, "rebar.config", "rebar.config"}, - {copy, "app.config", "app.config"}, - {copy, "test_SUITE.erl", "itest/test_SUITE.erl"}]. - -run(_Dir) -> - {ok, _} = retest:sh("./rebar compile ct"), - {ok, _} = retest:sh("./rebar compile ct -v"), - ok. - - - -%% -%% Generate the contents of a simple .app file -%% -app(Name) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, []}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/ct1/rebar.config b/inttest/ct1/rebar.config deleted file mode 100644 index 58047ba..0000000 --- a/inttest/ct1/rebar.config +++ /dev/null @@ -1,2 +0,0 @@ -{ct_dir, "itest"}. -{ct_extra_params, "-repeat 2 -erl_args -config app"}. diff --git a/inttest/ct1/test_SUITE.erl b/inttest/ct1/test_SUITE.erl deleted file mode 100644 index e8a2bb8..0000000 --- a/inttest/ct1/test_SUITE.erl +++ /dev/null @@ -1,17 +0,0 @@ --module(test_SUITE). - --compile(export_all). - --include_lib("ct.hrl"). - -all() -> - [simple_test, - app_config_file_test]. - -simple_test(Config) -> - io:format("Test: ~p\n", [Config]). - -app_config_file_test(_Config) -> - application:start(a1), - {ok, bar} = application:get_env(a1, foo), - application:stop(a1). diff --git a/inttest/ct2/ct2_rt.erl b/inttest/ct2/ct2_rt.erl deleted file mode 100644 index ecab0e4..0000000 --- a/inttest/ct2/ct2_rt.erl +++ /dev/null @@ -1,26 +0,0 @@ --module(ct2_rt). - --compile(export_all). - - -files() -> - [{create, "ebin/foo.app", app(foo)}, - {copy, "../../rebar", "rebar"}, - {copy, "foo.test.spec", "foo.test.spec"}, - {copy, "foo_SUITE.erl", "test/foo_SUITE.erl"}]. - -run(_Dir) -> - {ok, _} = retest:sh("./rebar compile ct -vvv"), - ok. - -%% -%% Generate the contents of a simple .app file -%% -app(Name) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, []}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/ct2/foo.test.spec b/inttest/ct2/foo.test.spec deleted file mode 100644 index f3e4cb0..0000000 --- a/inttest/ct2/foo.test.spec +++ /dev/null @@ -1 +0,0 @@ -{suites, "test", all}. diff --git a/inttest/ct2/foo_SUITE.erl b/inttest/ct2/foo_SUITE.erl deleted file mode 100644 index d03aedf..0000000 --- a/inttest/ct2/foo_SUITE.erl +++ /dev/null @@ -1,10 +0,0 @@ --module(foo_SUITE). - --include_lib("common_test/include/ct.hrl"). - --compile(export_all). - -all() -> [foo]. - -foo(Config) -> - io:format("Test: ~p\n", [Config]). diff --git a/inttest/depplugins/base_dir_cwd_plugin.erl b/inttest/depplugins/base_dir_cwd_plugin.erl deleted file mode 100644 index 4953b8b..0000000 --- a/inttest/depplugins/base_dir_cwd_plugin.erl +++ /dev/null @@ -1,7 +0,0 @@ --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 deleted file mode 100644 index fe1ceba..0000000 --- a/inttest/depplugins/dep_cwd_plugin.erl +++ /dev/null @@ -1,7 +0,0 @@ --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 deleted file mode 100644 index a45fa93..0000000 --- a/inttest/depplugins/depplugins_rt.erl +++ /dev/null @@ -1,69 +0,0 @@ -%%% @doc Plugin handling test -%%% -%%% This test checks if plugins are loaded correctly. -%%% -%%% It has three applications: -%%%
    -%%%
  1. fish. top-level app, has one dependency: `dependsonplugin'. -%%% It also loads a plugin from CWD which creates -%%% base_dir_cwd_pre.compile on pre_compile.
    2. -%%%
  2. dependsonplugin, has one dependency: `testplugin' and loads -%%% the testplugin_mod plugin.
    3. -%%%
  3. testplugin. This is a plugin application which creates -%%% plugin_pre.compile on pre_compile. It also loads a plugin from CWD -%%% which creates dep_cwd_pre.compile on pre_compile.
    4. -%%%
- --module(depplugins_rt). --compile(export_all). - --include_lib("eunit/include/eunit.hrl"). - -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, [])}, - - {copy, "rebar_dependsonplugin.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"}, - {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("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. - -%% -%% Generate the contents of a simple .app file -%% -app(Name, Modules) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, Modules}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/depplugins/rebar.config b/inttest/depplugins/rebar.config deleted file mode 100644 index 86fb037..0000000 --- a/inttest/depplugins/rebar.config +++ /dev/null @@ -1,2 +0,0 @@ -{deps, [dependsonplugin]}. -{plugins, [base_dir_cwd_plugin]}. diff --git a/inttest/depplugins/rebar_dependsonplugin.config b/inttest/depplugins/rebar_dependsonplugin.config deleted file mode 100644 index df36213..0000000 --- a/inttest/depplugins/rebar_dependsonplugin.config +++ /dev/null @@ -1,2 +0,0 @@ -{deps, [testplugin]}. -{plugins, [testplugin_mod]}. diff --git a/inttest/depplugins/rebar_testplugin.config b/inttest/depplugins/rebar_testplugin.config deleted file mode 100644 index 58a1f99..0000000 --- a/inttest/depplugins/rebar_testplugin.config +++ /dev/null @@ -1 +0,0 @@ -{plugins, [dep_cwd_plugin]}. diff --git a/inttest/depplugins/testplugin_mod.erl b/inttest/depplugins/testplugin_mod.erl deleted file mode 100644 index d829ff0..0000000 --- a/inttest/depplugins/testplugin_mod.erl +++ /dev/null @@ -1,7 +0,0 @@ --module(testplugin_mod). --export([pre_compile/2]). - -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]). diff --git a/inttest/erlc/asn1/SIMPLE-ASN.asn1 b/inttest/erlc/asn1/SIMPLE-ASN.asn1 deleted file mode 100644 index 62f0860..0000000 --- a/inttest/erlc/asn1/SIMPLE-ASN.asn1 +++ /dev/null @@ -1,7 +0,0 @@ -SIMPLE-ASN DEFINITIONS ::= BEGIN - - SimpleMessage ::= SEQUENCE { - id INTEGER - } - -END diff --git a/inttest/erlc/erlc_rt.erl b/inttest/erlc/erlc_rt.erl deleted file mode 100644 index 50cdb83..0000000 --- a/inttest/erlc/erlc_rt.erl +++ /dev/null @@ -1,137 +0,0 @@ -%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 ft=erlang et --module(erlc_rt). --export([files/0, - run/1]). - --include_lib("eunit/include/eunit.hrl"). - --define(MODULES, - [first_xrl, - first_yrl, - first_erl, - foo, - foo_app, - foo_sup, - foo_test_worker, - foo_worker, - 'SIMPLE-ASN']). - --define(BEAM_FILES, - ["first_xrl.beam", - "first_yrl.beam", - "first_erl.beam", - "foo.beam", - "foo_app.beam", - "foo_sup.beam", - "foo_test_worker.beam", - "foo_worker.beam", - "SIMPLE-ASN.beam"]). - -files() -> - [ - {copy, "../../rebar", "rebar"}, - {copy, "rebar.config", "rebar.config"}, - {copy, "rebar-no_debug_info.config", "rebar-no_debug_info.config"}, - {copy, "include", "include"}, - {copy, "extra-include", "extra-include"}, - {copy, "src", "src"}, - {copy, "extra-src", "extra-src"}, - {copy, "mibs", "mibs"}, - {copy, "asn1", "asn1"}, - {create, "ebin/foo.app", app(foo, ?MODULES)}, - %% deps - {create, "deps/foobar/ebin/foobar.app", app(foobar, [foobar])}, - {copy, "foobar.erl", "deps/foobar/src/foobar.erl"} - ]. - -run(_Dir) -> - ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])), - ok = check_beams(true), - ok = check_debug_info(true), - MibResult = filename:join(["priv", "mibs", "SIMPLE-MIB.bin"]), - ?assertMatch(true, filelib:is_regular(MibResult)), - ?assertMatch({ok, _}, retest_sh:run("./rebar clean", [])), - ok = check_beams(false), - ?assertMatch(false, filelib:is_regular(MibResult)), - ?assertMatch( - {ok, _}, - retest_sh:run("./rebar -C rebar-no_debug_info.config compile", [])), - ok = check_beams(true), - ok = check_debug_info(false), - ?assertMatch(true, filelib:is_regular(MibResult)), - %% Regression test for https://github.com/rebar/rebar/issues/249 - %% - %% Root cause: We didn't have per-project .rebar/erlcinfo but just one in - %% /.rebar/erlcinfo. - %% - %% Solution: Ensure every project has its own .rebar/erlcinfo - %% - %% For the bug to happen, the following conditions must be met: - %% - %% 1. /rebar.config has erl_first_files - %% 2. one of the 'first' files depends on another file (in this - %% case via -include_lib()) - %% 3. a sub project's rebar.config, if any, has no erl_first_files entry - %% - %% Now because erl_first_files is retrieved via rebar_config:get_list/3, - %% base_dir/rebar.config's erl_first_files is inherited, and because we had - %% a shared /.rebar/erlcinfo instead of one per project, the - %% cached entry was reused. Next, while compiling the sub project - %% rebar_erlc_compiler:needs_compile/3 gets a last modification time of - %% zero for the 'first' file which does not exist inside the sub project. - %% This, and the fact that it has at least one dependency, makes - %% needs_compile/3 return 'true'. The root cause is that we didn't have per - %% project .rebar/erlcinfo. For /.rebar/erlcinfo to be populated, - %% base_dir has to be compiled at least once. Therefore, after the first - %% compile any compile processing the sub project will fail because - %% needs_compile/3 will always return true for the non-existent 'first' - %% file. - ?assertMatch({ok, _}, retest_sh:run("./rebar clean", [])), - ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])), - ok = check_beams(true), - ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])), - ok = check_beams(true), - ok. - -check_beams(Exist) -> - check_files(Exist, fun filelib:is_regular/1). - -check_debug_info(HasDebugInfo) -> - check_files(HasDebugInfo, fun has_debug_info/1). - -check_files(Expected, Check) -> - lists:foreach( - fun(F) -> - File = filename:join("ebin", F), - ?assertEqual(Expected, Check(File)) - end, - ?BEAM_FILES). - -%% NOTE: Copied from dialyzer_utils:get_abstract_code_from_beam/1 and -%% modified for local use. We could have called the function directly, -%% but dialyzer_utils is not an official API to rely on. -has_debug_info(File) -> - case beam_lib:chunks(File, [abstract_code]) of - {ok, {_Mod, List}} -> - case lists:keyfind(abstract_code, 1, List) of - {abstract_code, {raw_abstract_v1, _Abstr}} -> - true; - _ -> - false - end; - _ -> - false - end. - -%% -%% Generate the contents of a simple .app file -%% -app(Name, Modules) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, Modules}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/erlc/extra-include/foo_extra.hrl b/inttest/erlc/extra-include/foo_extra.hrl deleted file mode 100644 index 19e9f94..0000000 --- a/inttest/erlc/extra-include/foo_extra.hrl +++ /dev/null @@ -1,3 +0,0 @@ -%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 ft=erlang et --define(FOO_EXTRA, foo_extra). diff --git a/inttest/erlc/extra-src/foo_sup.erl b/inttest/erlc/extra-src/foo_sup.erl deleted file mode 100644 index c68194e..0000000 --- a/inttest/erlc/extra-src/foo_sup.erl +++ /dev/null @@ -1,15 +0,0 @@ -%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 ft=erlang et --module(foo_sup). - --behavior(supervisor). - --export([start_link/0, - init/1]). - -start_link() -> - supervisor:start_link({local, ?MODULE}, ?MODULE, []). - -init(_Args) -> - FooChild = {foo,{foo, start_link, []}, permanent, 5000, worker, [foo]}, - {ok,{{one_for_all,1,1}, [FooChild]}}. diff --git a/inttest/erlc/foobar.erl b/inttest/erlc/foobar.erl deleted file mode 100644 index b6d55a8..0000000 --- a/inttest/erlc/foobar.erl +++ /dev/null @@ -1,8 +0,0 @@ -%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 ft=erlang et --module(foobar). - --export([test/0]). - -test() -> - true. diff --git a/inttest/erlc/include/foo_core.hrl b/inttest/erlc/include/foo_core.hrl deleted file mode 100644 index 803f2f0..0000000 --- a/inttest/erlc/include/foo_core.hrl +++ /dev/null @@ -1,3 +0,0 @@ -%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 ft=erlang et --define(FOO_CORE, foo_core). diff --git a/inttest/erlc/mibs/SIMPLE-MIB.mib b/inttest/erlc/mibs/SIMPLE-MIB.mib deleted file mode 100644 index ca8735a..0000000 --- a/inttest/erlc/mibs/SIMPLE-MIB.mib +++ /dev/null @@ -1,26 +0,0 @@ --- SIMPLE-MIB. --- This is just a simple MIB used for testing! --- - - -SIMPLE-MIB DEFINITIONS ::= BEGIN - -IMPORTS - MODULE-IDENTITY, enterprises - FROM SNMPv2-SMI; - -ericsson MODULE-IDENTITY - LAST-UPDATED - "201403060000Z" - ORGANIZATION - "rebar" - CONTACT-INFO - "rebar - or - whoever is currently responsible for the SIMPLE - enterprise MIB tree branch (enterprises.999)." - DESCRIPTION - "This very small module is made available - for mib-compilation testing." - ::= { enterprises 999 } -END diff --git a/inttest/erlc/rebar-no_debug_info.config b/inttest/erlc/rebar-no_debug_info.config deleted file mode 100644 index 07b6fed..0000000 --- a/inttest/erlc/rebar-no_debug_info.config +++ /dev/null @@ -1,11 +0,0 @@ -%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 ft=erlang et -{erl_first_files, ["src/first_xrl.erl", "src/first_yrl.erl"]}. - -{erl_opts, - [ - no_debug_info, - {i, "extra-include"}, - {src_dirs, ["src", "extra-src"]}, - {platform_define, "R13|R14", 'NO_CALLBACK_ATTRIBUTE'} - ]}. diff --git a/inttest/erlc/rebar.config b/inttest/erlc/rebar.config deleted file mode 100644 index 71d6660..0000000 --- a/inttest/erlc/rebar.config +++ /dev/null @@ -1,13 +0,0 @@ -%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 ft=erlang et -{erl_first_files, - ["src/first_xrl.erl", "src/first_yrl.erl", "src/first_erl.erl"]}. - -{deps, [foobar]}. - -{erl_opts, - [ - {i, "extra-include"}, - {src_dirs, ["src", "extra-src"]}, - {platform_define, "R13|R14", 'NO_CALLBACK_ATTRIBUTE'} - ]}. diff --git a/inttest/erlc/src/._do_not_compile.erl b/inttest/erlc/src/._do_not_compile.erl deleted file mode 100644 index c9d743b..0000000 --- a/inttest/erlc/src/._do_not_compile.erl +++ /dev/null @@ -1,4 +0,0 @@ -syntax error -this is file is here to verify that rebar does not try to -compile files like OS X resource forks and should not be -processed at all diff --git a/inttest/erlc/src/behaviour/foo_worker.erl b/inttest/erlc/src/behaviour/foo_worker.erl deleted file mode 100644 index 307c69a..0000000 --- a/inttest/erlc/src/behaviour/foo_worker.erl +++ /dev/null @@ -1,14 +0,0 @@ --module(foo_worker). - --ifdef(NO_CALLBACK_ATTRIBUTE). - --export([behaviour_info/1]). - -behaviour_info(callbacks) -> [{status, 0}]; -behaviour_info(_) -> undefined. - --else. - --callback status() -> 'idle' | 'busy'. - --endif. diff --git a/inttest/erlc/src/first_erl.erl b/inttest/erlc/src/first_erl.erl deleted file mode 100644 index 4e9ff20..0000000 --- a/inttest/erlc/src/first_erl.erl +++ /dev/null @@ -1,10 +0,0 @@ -%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 ft=erlang et --module(first_erl). - --include_lib("eunit/include/eunit.hrl"). - --export([test/0]). - -test() -> - ?debugHere. diff --git a/inttest/erlc/src/first_xrl.xrl b/inttest/erlc/src/first_xrl.xrl deleted file mode 100644 index 0de4c70..0000000 --- a/inttest/erlc/src/first_xrl.xrl +++ /dev/null @@ -1,13 +0,0 @@ -Definitions. - -D = [0-9] - -Rules. - -{D}+ : - {token,{integer,TokenLine,list_to_integer(TokenChars)}}. - -{D}+\.{D}+((E|e)(\+|\-)?{D}+)? : - {token,{float,TokenLine,list_to_float(TokenChars)}}. - -Erlang code. diff --git a/inttest/erlc/src/first_yrl.yrl b/inttest/erlc/src/first_yrl.yrl deleted file mode 100644 index 8ccdb0e..0000000 --- a/inttest/erlc/src/first_yrl.yrl +++ /dev/null @@ -1,9 +0,0 @@ -Nonterminals list elements element. -Terminals atom '(' ')'. -Rootsymbol list. -list -> '(' ')'. -list -> '(' elements ')'. -elements -> element. -elements -> element elements. -element -> atom. -element -> list. diff --git a/inttest/erlc/src/foo.erl b/inttest/erlc/src/foo.erl deleted file mode 100644 index 33e6cfc..0000000 --- a/inttest/erlc/src/foo.erl +++ /dev/null @@ -1,35 +0,0 @@ --module(foo). - --export([start_link/0, - start_link/1, - init/1, - terminate/2, - handle_info/2, - handle_call/3, - handle_cast/2, - code_change/3]). - --behavior(gen_server). - --include("foo_core.hrl"). --include("foo_extra.hrl"). --include_lib("kernel/include/file.hrl"). - --record(state, {node :: node()}). - -start_link() -> start_link(undefined). - -start_link(Args) -> - gen_server:start_link({local, ?MODULE}, ?MODULE, Args, []). - -init(_Args) -> {ok, #state{node=node()}}. - -terminate(_Reason, _Data) -> ok. - -handle_info(_Info, State) -> {noreply, State}. - -handle_cast(_Msg, State) -> {noreply, State}. - -handle_call(_Msg, _From, State) -> {reply, ok, State}. - -code_change(_OldVsn, State, _Extra) -> {ok, State}. diff --git a/inttest/erlc/src/foo_app.erl b/inttest/erlc/src/foo_app.erl deleted file mode 100644 index a3c7a96..0000000 --- a/inttest/erlc/src/foo_app.erl +++ /dev/null @@ -1,10 +0,0 @@ --module(foo_app). - --behaviour(application). - --export([start/2, - stop/1]). - -start(_Type, _Args) -> foo_sup:start_link(). - -stop(_State) -> ok. diff --git a/inttest/erlc/src/foo_test_worker.erl b/inttest/erlc/src/foo_test_worker.erl deleted file mode 100644 index 96ae932..0000000 --- a/inttest/erlc/src/foo_test_worker.erl +++ /dev/null @@ -1,34 +0,0 @@ --module(foo_test_worker). - --behaviour(gen_server). --behaviour(foo_worker). - --export([start_link/0, - start_link/1, - init/1, - handle_call/3, - handle_cast/2, - handle_info/2, - terminate/2, - code_change/3, - status/0]). - --include_lib("kernel/include/inet.hrl"). - -start_link() -> start_link(undefined). - -start_link(Args) -> gen_server:start_link(?MODULE, Args, []). - -init([]) -> {ok, undefined}. - -handle_call(_Event, _From, State) -> {reply, ok, State}. - -handle_cast(_Event, State) -> {noreply, State}. - -handle_info(_Info, State) -> {noreply, State}. - -terminate(_Reason, _State) -> ok. - -code_change(_OldVsn, State, _Extra) -> {ok, State}. - -status() -> busy. diff --git a/inttest/eunit/eunit_rt.erl b/inttest/eunit/eunit_rt.erl deleted file mode 100644 index 47f3331..0000000 --- a/inttest/eunit/eunit_rt.erl +++ /dev/null @@ -1,48 +0,0 @@ --module(eunit_rt). --export([files/0, run/1]). - --include_lib("eunit/include/eunit.hrl"). - -files() -> - [{create, "ebin/foo.app", app(foo)}, - {copy, "../../rebar", "rebar"}, - {copy, "src", "src"}, - {copy, "eunit_src", "eunit_src"}, - {copy, - "rebar-eunit_compile_opts.config", - "rebar-eunit_compile_opts.config"}]. - -run(_Dir) -> - ifdef_test(), - eunit_compile_opts_test(), - ok. - -ifdef_test() -> - {ok, Output} = retest:sh("./rebar -v eunit"), - ?assert(check_output(Output, "foo_test")), - ?assertMatch({ok, _}, retest:sh("./rebar clean")). - -eunit_compile_opts_test() -> - {ok, Output} = - retest:sh("./rebar -v -C rebar-eunit_compile_opts.config eunit"), - ?assert(check_output(Output, "bar_test")), - ?assertMatch( - {ok, _}, - retest:sh("./rebar -C rebar-eunit_compile_opts.config clean")). - -check_output(Output, Target) -> - lists:any(fun(Line) -> - string:str(Line, Target) > 0 - end, Output). - -%% -%% Generate the contents of a simple .app file -%% -app(Name) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, []}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/eunit/eunit_src/bar.erl b/inttest/eunit/eunit_src/bar.erl deleted file mode 100644 index 6a80dac..0000000 --- a/inttest/eunit/eunit_src/bar.erl +++ /dev/null @@ -1,6 +0,0 @@ --module(bar). - --include_lib("eunit/include/eunit.hrl"). - -bar_test() -> - ?assert(true). diff --git a/inttest/eunit/rebar-eunit_compile_opts.config b/inttest/eunit/rebar-eunit_compile_opts.config deleted file mode 100644 index 13b2d94..0000000 --- a/inttest/eunit/rebar-eunit_compile_opts.config +++ /dev/null @@ -1 +0,0 @@ -{eunit_compile_opts, [{src_dirs, ["eunit_src"]}]}. diff --git a/inttest/eunit/src/foo.erl b/inttest/eunit/src/foo.erl deleted file mode 100644 index a4c91ba..0000000 --- a/inttest/eunit/src/foo.erl +++ /dev/null @@ -1,10 +0,0 @@ --module(foo). - --ifdef(TEST). - --include_lib("eunit/include/eunit.hrl"). - -foo_test() -> - ?assert(true). - --endif. diff --git a/inttest/logging/logging_rt.erl b/inttest/logging/logging_rt.erl deleted file mode 100644 index 2b8e54b..0000000 --- a/inttest/logging/logging_rt.erl +++ /dev/null @@ -1,99 +0,0 @@ --module(logging_rt). --export([files/0, - run/1]). - --define(APP_FILE, "ebin/logging.app"). - -files() -> - [ - {copy, "../../rebar", "rebar"}, - {create, ?APP_FILE, app(invalid_name, [])} - ]. - -run(_Dir) -> - SharedExpected = "==> logging_rt \\(compile\\)", - %% provoke ERROR due to an invalid app file - retest:log(info, "Check 'compile' failure output~n"), - ok = check_output("./rebar compile -q", should_fail, - [SharedExpected, "ERROR: "], - ["WARN: ", "INFO: ", "DEBUG: "]), - %% fix bad app file - ok = file:write_file(?APP_FILE, app(logging, [])), - retest:log(info, "Check 'compile' success output~n"), - ok = check_output("./rebar compile", should_succeed, - [SharedExpected], - ["ERROR: ", "WARN: ", "INFO: ", "DEBUG: "]), - retest:log(info, "Check 'compile -v' success output~n"), - ok = check_output("./rebar compile -v", should_succeed, - [SharedExpected], - ["ERROR: ", "INFO: ", "DEBUG: "]), - retest:log(info, "Check 'compile -vv' success output~n"), - ok = check_output("./rebar compile -vv", should_succeed, - [SharedExpected, "DEBUG: "], - ["ERROR: ", "INFO: "]), - ok. - -check_output(Cmd, FailureMode, Expected, Unexpected) -> - case {retest:sh(Cmd), FailureMode} of - {{error, _}=Error, should_succeed} -> - retest:log(error, "cmd '~s' failed:~n~p~n", [Cmd, Error]), - Error; - {{ok, Captured}, should_succeed} -> - Joined = string:join(Captured, "\n"), - check_output1(Cmd, Joined, Expected, Unexpected); - {{error, {stopped, {_Rc, Captured}}}, should_fail} -> - Joined = string:join(Captured, "\n"), - check_output1(Cmd, Joined, Expected, Unexpected) - end. - -check_output1(Cmd, Captured, Expected, Unexpected) -> - ReOpts = [{capture, all, list}], - ExMatches = - lists:zf( - fun(Pattern) -> - case re:run(Captured, Pattern, ReOpts) of - nomatch -> - retest:log(error, - "Expected pattern '~s' missing " - "in the following output:~n" - "=== BEGIN ===~n~s~n=== END ===~n", - [Pattern, Captured]), - {true, Pattern}; - {match, _} -> - false - end - end, Expected), - - UnExMatches = - lists:zf( - fun(Pattern) -> - case re:run(Captured, Pattern, ReOpts) of - nomatch -> - false; - {match, [Match]} -> - retest:log( - console, - "Unexpected output when running cmd '~s':~n~s~n", - [Cmd, Match]), - {true, Match} - end - end, Unexpected), - - case {ExMatches, UnExMatches} of - {[], []} -> - ok; - _ -> - error - end. - -%% -%% Generate the contents of a simple .app file -%% -app(Name, Modules) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, Modules}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/rgen1/reltool.config b/inttest/rgen1/reltool.config deleted file mode 100644 index 4c4713c..0000000 --- a/inttest/rgen1/reltool.config +++ /dev/null @@ -1,31 +0,0 @@ -%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ts=4 sw=4 et -{sys, [ - {rel, "rgen1", "0.1", - [ - kernel, - stdlib, - sasl, - crypto - ]}, - {rel, "start_clean", "", - [ - kernel, - stdlib - ]}, - {boot_rel, "rgen1"}, - {profile, embedded}, - {excl_sys_filters, ["^bin/.*", - "^erts.*/bin/(dialyzer|typer)"]}, - {excl_archive_filters, [".*"]}, - {app, sasl, [{incl_cond, include}]} - ]}. - -{target_dir, "mytarget"}. - -{overlay_vars, "vars.config"}. - -{overlay, [ - {mkdir, "data"}, - {template, "test.config", "etc/test.config"} - ]}. diff --git a/inttest/rgen1/retest.config b/inttest/rgen1/retest.config deleted file mode 100644 index b569f14..0000000 --- a/inttest/rgen1/retest.config +++ /dev/null @@ -1 +0,0 @@ -{timeout, 120000}. diff --git a/inttest/rgen1/rgen1_rt.erl b/inttest/rgen1/rgen1_rt.erl deleted file mode 100644 index 68b6eaf..0000000 --- a/inttest/rgen1/rgen1_rt.erl +++ /dev/null @@ -1,18 +0,0 @@ --module(rgen1_rt). - --compile(export_all). - -%% Exercise release generation w/ templating - -files() -> - [ - {copy, "reltool.config"}, - {copy, "test.config"}, - {copy, "vars.config"}, - {copy, "../../rebar"} - ]. - -run(_Dir) -> - {ok, _} = retest_sh:run("./rebar -v generate", []), - true = filelib:is_dir("mytarget"), - ok. diff --git a/inttest/rgen1/test.config b/inttest/rgen1/test.config deleted file mode 100644 index 2fd1385..0000000 --- a/inttest/rgen1/test.config +++ /dev/null @@ -1 +0,0 @@ -{web_port, {{web_port}} }. diff --git a/inttest/rgen1/vars.config b/inttest/rgen1/vars.config deleted file mode 100644 index 174c51e..0000000 --- a/inttest/rgen1/vars.config +++ /dev/null @@ -1 +0,0 @@ -{web_port, 1234}. diff --git a/inttest/t_custom_config/custom.config b/inttest/t_custom_config/custom.config deleted file mode 100644 index 711c27f..0000000 --- a/inttest/t_custom_config/custom.config +++ /dev/null @@ -1,4 +0,0 @@ -{deps, [ - {boo, "."} -]}. -{erl_opts, [warnings_as_errors]}. diff --git a/inttest/t_custom_config/custom_config.erl b/inttest/t_custom_config/custom_config.erl deleted file mode 100644 index 8656201..0000000 --- a/inttest/t_custom_config/custom_config.erl +++ /dev/null @@ -1,6 +0,0 @@ --module(custom_config). - --compile(export_all). - -test() -> - ok. diff --git a/inttest/t_custom_config/t_custom_config_rt.erl b/inttest/t_custom_config/t_custom_config_rt.erl deleted file mode 100644 index b56eb1a..0000000 --- a/inttest/t_custom_config/t_custom_config_rt.erl +++ /dev/null @@ -1,39 +0,0 @@ --module(t_custom_config_rt). - --compile(export_all). - --include_lib("eunit/include/eunit.hrl"). - -files() -> - [{copy, "../../rebar", "rebar"}, - {copy, "custom.config", "custom.config"}, - {create, "ebin/custom_config.app", app(custom_config, [custom_config])}]. - -run(Dir) -> - retest_log:log(debug, "Running in Dir: ~s~n", [Dir]), - Ref = retest:sh("./rebar -C custom.config check-deps -vv", - [{async, true}]), - {ok, Captured} = - retest:sh_expect(Ref, - "DEBUG: Consult config file .*/custom.config.*", - [{capture, all, list}]), - {ok, Missing} = - retest:sh_expect(Ref, - "DEBUG: Missing deps : \\[\\{dep,bad_name," - "boo,\"\\.\",undefined,false\\}\\]", - [{capture, all, list}]), - retest_log:log(debug, "[CAPTURED]: ~s~n", [Captured]), - retest_log:log(debug, "[Missing]: ~s~n", [Missing]), - ok. - -%% -%% Generate the contents of a simple .app file -%% -app(Name, Modules) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, Modules}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/tdeps1/a.erl b/inttest/tdeps1/a.erl deleted file mode 100644 index 835522a..0000000 --- a/inttest/tdeps1/a.erl +++ /dev/null @@ -1,8 +0,0 @@ --module(a). - --compile(export_all). - --include_lib("b/include/b.hrl"). - -hello() -> - io:format("~s\n", [?HELLO]). diff --git a/inttest/tdeps1/a.rebar.config b/inttest/tdeps1/a.rebar.config deleted file mode 100644 index 991ea5a..0000000 --- a/inttest/tdeps1/a.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{b, "1", {git, "../repo/b"}}]}. diff --git a/inttest/tdeps1/b.hrl b/inttest/tdeps1/b.hrl deleted file mode 100644 index efbeab1..0000000 --- a/inttest/tdeps1/b.hrl +++ /dev/null @@ -1 +0,0 @@ --include_lib("c/include/c.hrl"). diff --git a/inttest/tdeps1/b.rebar.config b/inttest/tdeps1/b.rebar.config deleted file mode 100644 index ffbd0db..0000000 --- a/inttest/tdeps1/b.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{c, "1", {git, "../repo/c"}}]}. diff --git a/inttest/tdeps1/c.hrl b/inttest/tdeps1/c.hrl deleted file mode 100644 index 9f02fab..0000000 --- a/inttest/tdeps1/c.hrl +++ /dev/null @@ -1 +0,0 @@ --define(HELLO, hello). diff --git a/inttest/tdeps1/tdeps1_rt.erl b/inttest/tdeps1/tdeps1_rt.erl deleted file mode 100644 index a72cc83..0000000 --- a/inttest/tdeps1/tdeps1_rt.erl +++ /dev/null @@ -1,60 +0,0 @@ --module(tdeps1_rt). - --compile(export_all). - -%% Exercise transitive dependencies -%% A -> B -> C, where A includes a .hrl from B which includes .hrl from C - -files() -> - [ - %% A application - {create, "ebin/a.app", app(a, [a])}, - {copy, "a.rebar.config", "rebar.config"}, - {copy, "a.erl", "src/a.erl"}, - {copy, "../../rebar", "rebar"}, - - %% B application - {create, "repo/b/ebin/b.app", app(b, [])}, - {copy, "b.rebar.config", "repo/b/rebar.config"}, - {copy, "b.hrl", "repo/b/include/b.hrl"}, - - %% C application - {create, "repo/c/ebin/c.app", app(c, [])}, - {copy, "c.hrl", "repo/c/include/c.hrl"} - ]. - -apply_cmds([], _Params) -> - ok; -apply_cmds([Cmd | Rest], Params) -> - io:format("Running: ~s (~p)\n", [Cmd, Params]), - {ok, _} = retest_sh:run(Cmd, Params), - apply_cmds(Rest, Params). - -run(_Dir) -> - %% Initialize the b/c apps as git repos so that dependencies pull - %% properly - GitCmds = ["git init", - "git add -A", - "git config user.email 'tdeps@example.com'", - "git config user.name 'tdeps'", - "git commit -a -m 'Initial Commit'"], - apply_cmds(GitCmds, [{dir, "repo/b"}]), - apply_cmds(GitCmds, [{dir, "repo/c"}]), - - {ok, _} = retest_sh:run("./rebar get-deps", []), - {ok, _} = retest_sh:run("./rebar compile", []), - - true = filelib:is_regular("ebin/a.beam"), - ok. - -%% -%% Generate the contents of a simple .app file -%% -app(Name, Modules) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, Modules}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/tdeps2/a.erl b/inttest/tdeps2/a.erl deleted file mode 100644 index 294ae21..0000000 --- a/inttest/tdeps2/a.erl +++ /dev/null @@ -1,3 +0,0 @@ --module({{module}}). - --include_lib("b/include/b.hrl"). diff --git a/inttest/tdeps2/a.rebar.config b/inttest/tdeps2/a.rebar.config deleted file mode 100644 index 991ea5a..0000000 --- a/inttest/tdeps2/a.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{b, "1", {git, "../repo/b"}}]}. diff --git a/inttest/tdeps2/b.hrl b/inttest/tdeps2/b.hrl deleted file mode 100644 index efbeab1..0000000 --- a/inttest/tdeps2/b.hrl +++ /dev/null @@ -1 +0,0 @@ --include_lib("c/include/c.hrl"). diff --git a/inttest/tdeps2/b.rebar.config b/inttest/tdeps2/b.rebar.config deleted file mode 100644 index ffbd0db..0000000 --- a/inttest/tdeps2/b.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{c, "1", {git, "../repo/c"}}]}. diff --git a/inttest/tdeps2/c.hrl b/inttest/tdeps2/c.hrl deleted file mode 100644 index 9f02fab..0000000 --- a/inttest/tdeps2/c.hrl +++ /dev/null @@ -1 +0,0 @@ --define(HELLO, hello). diff --git a/inttest/tdeps2/root.rebar.config b/inttest/tdeps2/root.rebar.config deleted file mode 100644 index 005adfe..0000000 --- a/inttest/tdeps2/root.rebar.config +++ /dev/null @@ -1,2 +0,0 @@ -{sub_dirs, ["apps/a1", - "apps/a2"]}. diff --git a/inttest/tdeps2/tdeps2_rt.erl b/inttest/tdeps2/tdeps2_rt.erl deleted file mode 100644 index 22f0abe..0000000 --- a/inttest/tdeps2/tdeps2_rt.erl +++ /dev/null @@ -1,66 +0,0 @@ --module(tdeps2_rt). - --compile(export_all). - -%% Exercise transitive dependencies where there are multiple files -%% depending on the same set of deps -%% [A1, A2] -> B -> C ; A1 and A2 includes B.hrl which includes C.hrl - -files() -> - [ - %% A1 application - {create, "apps/a1/ebin/a1.app", app(a1, [a1])}, - {copy, "a.rebar.config", "apps/a1/rebar.config"}, - {template, "a.erl", "apps/a1/src/a1.erl", dict:from_list([{module, a1}])}, - - %% A2 application - {create, "apps/a2/ebin/a2.app", app(a2, [a2])}, - {copy, "a.rebar.config", "apps/a2/rebar.config"}, - {template, "a.erl", "apps/a2/src/a2.erl", dict:from_list([{module, a2}])}, - - {copy, "root.rebar.config", "rebar.config"}, - {copy, "../../rebar", "rebar"}, - - %% B application - {create, "repo/b/ebin/b.app", app(b, [])}, - {copy, "b.rebar.config", "repo/b/rebar.config"}, - {copy, "b.hrl", "repo/b/include/b.hrl"}, - - %% C application - {create, "repo/c/ebin/c.app", app(c, [])}, - {copy, "c.hrl", "repo/c/include/c.hrl"} - ]. - -apply_cmds([], _Params) -> - ok; -apply_cmds([Cmd | Rest], Params) -> - io:format("Running: ~s (~p)\n", [Cmd, Params]), - {ok, _} = retest_sh:run(Cmd, Params), - apply_cmds(Rest, Params). - -run(_Dir) -> - %% Initialize the b/c apps as git repos so that dependencies pull - %% properly - GitCmds = ["git init", - "git add -A", - "git config user.email 'tdeps@example.com'", - "git config user.name 'tdeps'", - "git commit -a -m 'Initial Commit'"], - ok = apply_cmds(GitCmds, [{dir, "repo/b"}]), - ok = apply_cmds(GitCmds, [{dir, "repo/c"}]), - - {ok, _} = retest_sh:run("./rebar -v get-deps", []), - {ok, _} = retest_sh:run("./rebar -v compile", []), - ok. - -%% -%% Generate the contents of a simple .app file -%% -app(Name, Modules) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, Modules}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/tdeps3/a.erl b/inttest/tdeps3/a.erl deleted file mode 100644 index 5a387eb..0000000 --- a/inttest/tdeps3/a.erl +++ /dev/null @@ -1,3 +0,0 @@ --module({{module}}). - --include_lib("{{dep}}/include/{{dep}}.hrl"). diff --git a/inttest/tdeps3/a.rebar.config b/inttest/tdeps3/a.rebar.config deleted file mode 100644 index 19b8ef8..0000000 --- a/inttest/tdeps3/a.rebar.config +++ /dev/null @@ -1,4 +0,0 @@ -{deps, [ - {b, "1", {git, "../repo/b"}}, - {f, "1", {git, "../repo/f"}} -]}. diff --git a/inttest/tdeps3/b.hrl b/inttest/tdeps3/b.hrl deleted file mode 100644 index efbeab1..0000000 --- a/inttest/tdeps3/b.hrl +++ /dev/null @@ -1 +0,0 @@ --include_lib("c/include/c.hrl"). diff --git a/inttest/tdeps3/b.rebar.config b/inttest/tdeps3/b.rebar.config deleted file mode 100644 index d1ccae2..0000000 --- a/inttest/tdeps3/b.rebar.config +++ /dev/null @@ -1,5 +0,0 @@ -{deps, [ - {c, "1", {git, "../repo/c"}} -]}. - -{lib_dirs, [apps]}. diff --git a/inttest/tdeps3/c.hrl b/inttest/tdeps3/c.hrl deleted file mode 100644 index cc87fff..0000000 --- a/inttest/tdeps3/c.hrl +++ /dev/null @@ -1 +0,0 @@ --include_lib("d/include/d.hrl"). diff --git a/inttest/tdeps3/c.rebar.config b/inttest/tdeps3/c.rebar.config deleted file mode 100644 index b590771..0000000 --- a/inttest/tdeps3/c.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{d, "1", {git, "../repo/d"}}]}. diff --git a/inttest/tdeps3/d.hrl b/inttest/tdeps3/d.hrl deleted file mode 100644 index 02f8088..0000000 --- a/inttest/tdeps3/d.hrl +++ /dev/null @@ -1 +0,0 @@ --include_lib("e/include/e.hrl"). diff --git a/inttest/tdeps3/d.rebar.config b/inttest/tdeps3/d.rebar.config deleted file mode 100644 index 4c7cd54..0000000 --- a/inttest/tdeps3/d.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{e, "1", {git, "../repo/e"}}]}. diff --git a/inttest/tdeps3/e.hrl b/inttest/tdeps3/e.hrl deleted file mode 100644 index 9f02fab..0000000 --- a/inttest/tdeps3/e.hrl +++ /dev/null @@ -1 +0,0 @@ --define(HELLO, hello). diff --git a/inttest/tdeps3/f.hrl b/inttest/tdeps3/f.hrl deleted file mode 100644 index 02f8088..0000000 --- a/inttest/tdeps3/f.hrl +++ /dev/null @@ -1 +0,0 @@ --include_lib("e/include/e.hrl"). diff --git a/inttest/tdeps3/root.rebar.config b/inttest/tdeps3/root.rebar.config deleted file mode 100644 index d1c3793..0000000 --- a/inttest/tdeps3/root.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{sub_dirs, ["apps/a"]}. diff --git a/inttest/tdeps3/tdeps3_rt.erl b/inttest/tdeps3/tdeps3_rt.erl deleted file mode 100644 index da87d43..0000000 --- a/inttest/tdeps3/tdeps3_rt.erl +++ /dev/null @@ -1,89 +0,0 @@ --module(tdeps3_rt). - --compile(export_all). - -%% Exercise transitive dependencies where there are multiple files -%% depending on the same set of deps as well as lib_dir directives -%% A -> B -> C -> D -> E -%% |--> G(via lib_dir) -%% |--> F -> D -> E - -files() -> - [ - %% A1 application - {create, "ebin/a.app", app(a, [a])}, - {template, "a.erl", "src/a.erl", dict:from_list([{module, a}, {dep, b}])}, - - {copy, "a.rebar.config", "rebar.config"}, - {copy, "../../rebar", "rebar"}, - - %% B application - {create, "repo/b/ebin/b.app", app(b, [b])}, - {template, "a.erl", "repo/b/src/b.erl", dict:from_list([{module, b}, {dep, b}])}, - {copy, "b.rebar.config", "repo/b/rebar.config"}, - {copy, "b.hrl", "repo/b/include/b.hrl"}, - - %% C application - {create, "repo/c/ebin/c.app", app(c, [c])}, - {template, "a.erl", "repo/c/src/c.erl", dict:from_list([{module, c}, {dep, d}])}, - {copy, "c.rebar.config", "repo/c/rebar.config"}, - {copy, "c.hrl", "repo/c/include/c.hrl"}, - - %% D application - {create, "repo/d/ebin/d.app", app(d, [d])}, - {template, "a.erl", "repo/d/src/d.erl", dict:from_list([{module, d}, {dep, e}])}, - {copy, "d.rebar.config", "repo/d/rebar.config"}, - {copy, "d.hrl", "repo/d/include/d.hrl"}, - - %% E application - {create, "repo/e/ebin/e.app", app(e, [])}, - {copy, "e.hrl", "repo/e/include/e.hrl"}, - - - %% F application - {create, "repo/f/ebin/f.app", app(f, [f])}, - {template, "a.erl", "repo/f/src/f.erl", dict:from_list([{module, f}, {dep, d}])}, - {copy, "c.rebar.config", "repo/f/rebar.config"}, - {copy, "f.hrl", "repo/f/include/f.hrl"}, - - %% G application, which is part of the B repo, in a lib_dir - {create, "repo/b/apps/g/ebin/g.app", app(g, [])}, - {copy, "e.hrl", "repo/b/apps/g/include/g.hrl"} - - ]. - -apply_cmds([], _Params) -> - ok; -apply_cmds([Cmd | Rest], Params) -> - io:format("Running: ~s (~p)\n", [Cmd, Params]), - {ok, _} = retest_sh:run(Cmd, Params), - apply_cmds(Rest, Params). - -run(_Dir) -> - %% Initialize the b/c apps as git repos so that dependencies pull - %% properly - GitCmds = ["git init", - "git add -A", - "git config user.email 'tdeps@example.com'", - "git config user.name 'tdeps'", - "git commit -a -m 'Initial Commit'"], - ok = apply_cmds(GitCmds, [{dir, "repo/b"}]), - ok = apply_cmds(GitCmds, [{dir, "repo/c"}]), - ok = apply_cmds(GitCmds, [{dir, "repo/d"}]), - ok = apply_cmds(GitCmds, [{dir, "repo/e"}]), - ok = apply_cmds(GitCmds, [{dir, "repo/f"}]), - - {ok, _} = retest_sh:run("./rebar -v get-deps compile", []), - ok. - -%% -%% Generate the contents of a simple .app file -%% -app(Name, Modules) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, Modules}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/tdeps_update/a.erl b/inttest/tdeps_update/a.erl deleted file mode 100644 index 294ae21..0000000 --- a/inttest/tdeps_update/a.erl +++ /dev/null @@ -1,3 +0,0 @@ --module({{module}}). - --include_lib("b/include/b.hrl"). diff --git a/inttest/tdeps_update/a.rebar.config b/inttest/tdeps_update/a.rebar.config deleted file mode 100644 index 3b721dc..0000000 --- a/inttest/tdeps_update/a.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{b, "0.2.3", {git, "../repo/b", {tag, "0.2.3"}}}]}. diff --git a/inttest/tdeps_update/a2.rebar.config b/inttest/tdeps_update/a2.rebar.config deleted file mode 100644 index 5687349..0000000 --- a/inttest/tdeps_update/a2.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{b, "0.2.4", {git, "../repo/b", {tag, "0.2.4"}}}]}. diff --git a/inttest/tdeps_update/a3.rebar.config b/inttest/tdeps_update/a3.rebar.config deleted file mode 100644 index 86bf462..0000000 --- a/inttest/tdeps_update/a3.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{b, "0.2.5", {git, "../repo/b", {tag, "0.2.5"}}}]}. diff --git a/inttest/tdeps_update/a4.rebar.config b/inttest/tdeps_update/a4.rebar.config deleted file mode 100644 index bfba813..0000000 --- a/inttest/tdeps_update/a4.rebar.config +++ /dev/null @@ -1,4 +0,0 @@ -{deps, [ - {b, "0.2.6", {git, "../repo/b", {tag, "0.2.6"}}}, - {f, "0.1", {git, "../repo/f", {tag, "0.1"}}} - ]}. diff --git a/inttest/tdeps_update/b.hrl b/inttest/tdeps_update/b.hrl deleted file mode 100644 index efbeab1..0000000 --- a/inttest/tdeps_update/b.hrl +++ /dev/null @@ -1 +0,0 @@ --include_lib("c/include/c.hrl"). diff --git a/inttest/tdeps_update/b.rebar.config b/inttest/tdeps_update/b.rebar.config deleted file mode 100644 index 536aaa9..0000000 --- a/inttest/tdeps_update/b.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{c, "1.0", {git, "../repo/c", {tag, "1.0"}}}]}. diff --git a/inttest/tdeps_update/b2.rebar.config b/inttest/tdeps_update/b2.rebar.config deleted file mode 100644 index b603277..0000000 --- a/inttest/tdeps_update/b2.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{c, "1.1", {git, "../repo/c", {tag, "1.1"}}}]}. diff --git a/inttest/tdeps_update/b3.rebar.config b/inttest/tdeps_update/b3.rebar.config deleted file mode 100644 index 5f4e20a..0000000 --- a/inttest/tdeps_update/b3.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{c, "1.2", {git, "../repo/c", {tag, "1.2"}}}]}. diff --git a/inttest/tdeps_update/b4.rebar.config b/inttest/tdeps_update/b4.rebar.config deleted file mode 100644 index 5fd1dca..0000000 --- a/inttest/tdeps_update/b4.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{c, "1.3", {git, "../repo/c", {tag, "1.3"}}}]}. diff --git a/inttest/tdeps_update/c.hrl b/inttest/tdeps_update/c.hrl deleted file mode 100644 index 9f02fab..0000000 --- a/inttest/tdeps_update/c.hrl +++ /dev/null @@ -1 +0,0 @@ --define(HELLO, hello). diff --git a/inttest/tdeps_update/c.rebar.config b/inttest/tdeps_update/c.rebar.config deleted file mode 100644 index d99b963..0000000 --- a/inttest/tdeps_update/c.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{deps, [{d, "0.7", {git, "../repo/d", {tag, "0.7"}}}]}. diff --git a/inttest/tdeps_update/c2.hrl b/inttest/tdeps_update/c2.hrl deleted file mode 100644 index cc87fff..0000000 --- a/inttest/tdeps_update/c2.hrl +++ /dev/null @@ -1 +0,0 @@ --include_lib("d/include/d.hrl"). diff --git a/inttest/tdeps_update/c2.rebar.config b/inttest/tdeps_update/c2.rebar.config deleted file mode 100644 index 1297e07..0000000 --- a/inttest/tdeps_update/c2.rebar.config +++ /dev/null @@ -1,4 +0,0 @@ -{deps, [ - {d, "0.7", {git, "../repo/d", {tag, "0.7"}}}, - {e, "2.0", {git, "../repo/e", {tag, "2.0"}}} - ]}. diff --git a/inttest/tdeps_update/c3.rebar.config b/inttest/tdeps_update/c3.rebar.config deleted file mode 100644 index 40c93c5..0000000 --- a/inttest/tdeps_update/c3.rebar.config +++ /dev/null @@ -1,4 +0,0 @@ -{deps, [ - {d, "0.7", {git, "../repo/d", {tag, "0.7"}}}, - {e, "2.1", {git, "../repo/e", {tag, "2.1"}}} - ]}. diff --git a/inttest/tdeps_update/d.hrl b/inttest/tdeps_update/d.hrl deleted file mode 100644 index 9f02fab..0000000 --- a/inttest/tdeps_update/d.hrl +++ /dev/null @@ -1 +0,0 @@ --define(HELLO, hello). diff --git a/inttest/tdeps_update/root.rebar.config b/inttest/tdeps_update/root.rebar.config deleted file mode 100644 index ea03437..0000000 --- a/inttest/tdeps_update/root.rebar.config +++ /dev/null @@ -1 +0,0 @@ -{sub_dirs, ["apps/a1"]}. diff --git a/inttest/tdeps_update/tdeps_update_rt.erl b/inttest/tdeps_update/tdeps_update_rt.erl deleted file mode 100644 index e182ae2..0000000 --- a/inttest/tdeps_update/tdeps_update_rt.erl +++ /dev/null @@ -1,148 +0,0 @@ --module(tdeps_update_rt). - --compile(export_all). - -%% Exercises update deps, with recursive dependency updates. -%% Initially: -%% A(v0.5) -> B(v0.2.3) -> C(v1.0) -%% But after updating A to 0.6: -%% A(v0.6) -> B(v0.2.4) -> C(v1.1) -%% -> D(v0.7) -%% And after updating A to 0.7: -%% A(v0.7) -> B(v0.2.5) -> C(v1.2) -> E(v2.0) -%% -> D(v0.7) -%% And after updating A to 0.8: -%% A(v0.8) -> B(v0.2.6) -> C(v1.3) -> E(v2.1) -%% -> D(v0.7) -%% -> F(v0.1) -> E(v2.1) -files() -> - [ - %% A1 application - {create, "apps/a1/ebin/a1.app", app(a1, [a1], "0.5")}, - {copy, "a.rebar.config", "apps/a1/rebar.config"}, - {template, "a.erl", "apps/a1/src/a1.erl", dict:from_list([{module, a1}])}, - - {copy, "root.rebar.config", "rebar.config"}, - {copy, "../../rebar", "rebar"}, - - %% B application - {create, "repo/b/ebin/b.app", app(b, [], "0.2.3")}, - {create, "b2.app", app(b, [], "0.2.4")}, - {create, "b3.app", app(b, [], "0.2.5")}, - {create, "b4.app", app(b, [], "0.2.6")}, - {copy, "b.rebar.config", "repo/b/rebar.config"}, - {copy, "b.hrl", "repo/b/include/b.hrl"}, - - %% C application - {create, "repo/c/ebin/c.app", app(c, [], "1.0")}, - {create, "c2.app", app(c, [], "1.1")}, - {create, "c3.app", app(c, [], "1.2")}, - {create, "c4.app", app(c, [], "1.3")}, - {copy, "c.hrl", "repo/c/include/c.hrl"}, - - %% D application - {create, "repo/d/ebin/d.app", app(d, [], "0.7")}, - {copy, "d.hrl", "repo/d/include/d.hrl"}, - - %% E application - {create, "repo/e/ebin/e.app", app(e, [], "2.0")}, - {create, "e2.app", app(e, [], "2.1")}, - - %% F application - {create, "repo/f/ebin/f.app", app(f, [], "0.1")}, - - %% update files - {copy, "a2.rebar.config", "a2.rebar.config"}, - {copy, "a3.rebar.config", "a3.rebar.config"}, - {copy, "a4.rebar.config", "a4.rebar.config"}, - {copy, "b2.rebar.config", "b2.rebar.config"}, - {copy, "b3.rebar.config", "b3.rebar.config"}, - {copy, "b4.rebar.config", "b4.rebar.config"}, - {copy, "c2.hrl", "c2.hrl"}, - {copy, "c.rebar.config", "c.rebar.config"}, - {copy, "c2.rebar.config", "c2.rebar.config"}, - {copy, "c3.rebar.config", "c3.rebar.config"} - ]. - -apply_cmds([], _Params) -> - ok; -apply_cmds([Cmd | Rest], Params) -> - io:format("Running: ~s (~p)\n", [Cmd, Params]), - {ok, _} = retest_sh:run(Cmd, Params), - apply_cmds(Rest, Params). - -run(_Dir) -> - %% Initialize the b/c/d apps as git repos so that dependencies pull - %% properly - GitCmds = ["git init", - "git add -A", - "git config user.email 'tdeps@example.com'", - "git config user.name 'tdeps'", - "git commit -a -m 'Initial Commit'"], - BCmds = ["git tag 0.2.3", - "cp ../../b2.rebar.config rebar.config", - "cp ../../b2.app ebin/b.app", - "git commit -a -m 'update to 0.2.4'", - "git tag 0.2.4", - "cp ../../b3.rebar.config rebar.config", - "cp ../../b3.app ebin/b.app", - "git commit -a -m 'update to 0.2.5'", - "git tag 0.2.5", - "cp ../../b4.rebar.config rebar.config", - "cp ../../b4.app ebin/b.app", - "git commit -a -m 'update to 0.2.6'", - "git tag 0.2.6"], - %"git checkout 0.2.3"], - CCmds = ["git tag 1.0", - "cp ../../c2.hrl include/c.hrl", - "cp ../../c2.app ebin/c.app", - "cp ../../c.rebar.config rebar.config", - "git add rebar.config", - "git commit -a -m 'update to 1.1'", - "git tag 1.1", - "cp ../../c3.app ebin/c.app", - "cp ../../c2.rebar.config rebar.config", - "git commit -a -m 'update to 1.2'", - "git tag 1.2", - "cp ../../c4.app ebin/c.app", - "cp ../../c3.rebar.config rebar.config", - "git commit -a -m 'update to 1.3'", - "git tag 1.3"], - %"git checkout 1.0"], - DCmds = ["git tag 0.7"], - ECmds = ["git tag 2.0", - "cp ../../e2.app ebin/e.app", - "git commit -a -m 'update to 2.1'", - "git tag 2.1"], - FCmds = ["git tag 0.1"], - - ok = apply_cmds(GitCmds++BCmds, [{dir, "repo/b"}]), - ok = apply_cmds(GitCmds++CCmds, [{dir, "repo/c"}]), - ok = apply_cmds(GitCmds++DCmds, [{dir, "repo/d"}]), - ok = apply_cmds(GitCmds++ECmds, [{dir, "repo/e"}]), - ok = apply_cmds(GitCmds++FCmds, [{dir, "repo/f"}]), - - {ok, _} = retest_sh:run("./rebar -v get-deps", []), - {ok, _} = retest_sh:run("./rebar -v compile", []), - os:cmd("cp a2.rebar.config apps/a1/rebar.config"), - {ok, _} = retest_sh:run("./rebar -v update-deps", []), - {ok, _} = retest_sh:run("./rebar -v compile", []), - os:cmd("cp a3.rebar.config apps/a1/rebar.config"), - {ok, _} = retest_sh:run("./rebar -v update-deps", []), - {ok, _} = retest_sh:run("./rebar -v compile", []), - os:cmd("cp a4.rebar.config apps/a1/rebar.config"), - {ok, _} = retest_sh:run("./rebar -v update-deps", []), - {ok, _} = retest_sh:run("./rebar -v compile", []), - ok. - -%% -%% Generate the contents of a simple .app file -%% -app(Name, Modules, Version) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, Version}, - {modules, Modules}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/thooks/fish.erl b/inttest/thooks/fish.erl deleted file mode 100644 index 739cb94..0000000 --- a/inttest/thooks/fish.erl +++ /dev/null @@ -1,5 +0,0 @@ --module(fish). - --compile(export_all). - -fish() -> fish. diff --git a/inttest/thooks/rebar.config b/inttest/thooks/rebar.config deleted file mode 100644 index 6514818..0000000 --- a/inttest/thooks/rebar.config +++ /dev/null @@ -1,7 +0,0 @@ -%% pre-scripts -{pre_hooks, [{clean, "echo preclean >> preclean.out"}, - {compile, "echo precompile >> precompile.out"}]}. - -%% post-scripts -{post_hooks, [{clean, "echo postclean >> postclean.out"}, - {compile, "echo postcompile >> postcompile.out"}]}. diff --git a/inttest/thooks/thooks_rt.erl b/inttest/thooks/thooks_rt.erl deleted file mode 100644 index 52af9f5..0000000 --- a/inttest/thooks/thooks_rt.erl +++ /dev/null @@ -1,40 +0,0 @@ --module(thooks_rt). - --include_lib("eunit/include/eunit.hrl"). --compile(export_all). - -files() -> - [ - %% dummy lfe files - {copy, "../../rebar", "rebar"}, - {copy, "rebar.config", "rebar.config"}, - {copy, "fish.erl", "src/fish.erl"}, - {create, "ebin/fish.app", app(fish, [fish])} - ]. - -run(_Dir) -> - ?assertMatch({ok, _}, retest_sh:run("./rebar -v clean compile", [])), - ensure_command_ran_only_once("preclean"), - ensure_command_ran_only_once("precompile"), - ensure_command_ran_only_once("postclean"), - ensure_command_ran_only_once("postcompile"), - ok. - -ensure_command_ran_only_once(Command) -> - File = Command ++ ".out", - ?assert(filelib:is_regular(File)), - %% ensure that this command only ran once (not for each module) - {ok, Content} = file:read_file(File), - ?assertEqual(Command ++ "\n", binary_to_list(Content)). - -%% -%% Generate the contents of a simple .app file -%% -app(Name, Modules) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, Modules}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). diff --git a/inttest/tplugins/bad.config b/inttest/tplugins/bad.config deleted file mode 100644 index 23069b8..0000000 --- a/inttest/tplugins/bad.config +++ /dev/null @@ -1,2 +0,0 @@ -{plugins, [bad_plugin]}. -{plugin_dir, "bad_plugins"}. diff --git a/inttest/tplugins/bad_plugin.erl b/inttest/tplugins/bad_plugin.erl deleted file mode 100644 index 77ec01b..0000000 --- a/inttest/tplugins/bad_plugin.erl +++ /dev/null @@ -1,7 +0,0 @@ --module(bad_plugin). --compile(export_all). - -%% this plugin contains numerous DELIBERATE syntax errors - -fwibble(Config, _) > - file:delete("fwibble.test") diff --git a/inttest/tplugins/fish.erl b/inttest/tplugins/fish.erl deleted file mode 100644 index 739cb94..0000000 --- a/inttest/tplugins/fish.erl +++ /dev/null @@ -1,5 +0,0 @@ --module(fish). - --compile(export_all). - -fish() -> fish. diff --git a/inttest/tplugins/rebar.config b/inttest/tplugins/rebar.config deleted file mode 100644 index 0b9c887..0000000 --- a/inttest/tplugins/rebar.config +++ /dev/null @@ -1 +0,0 @@ -{plugins, [test_plugin]}. diff --git a/inttest/tplugins/test_plugin.erl b/inttest/tplugins/test_plugin.erl deleted file mode 100644 index 461247c..0000000 --- a/inttest/tplugins/test_plugin.erl +++ /dev/null @@ -1,8 +0,0 @@ --module(test_plugin). --compile(export_all). - -fwibble(Config, _) -> - Pwd = rebar_utils:get_cwd(), - Ok = filelib:is_regular(filename:join(Pwd, "fwibble.test")), - rebar_log:log(info, "~p:~p in ~s :: ~p~n", [test_plugin, clean, Pwd, Ok]), - ok = file:delete("fwibble.test"). diff --git a/inttest/tplugins/tplugins_rt.erl b/inttest/tplugins/tplugins_rt.erl deleted file mode 100644 index d6908ad..0000000 --- a/inttest/tplugins/tplugins_rt.erl +++ /dev/null @@ -1,40 +0,0 @@ --module(tplugins_rt). --compile(export_all). - --include_lib("eunit/include/eunit.hrl"). - --define(COMPILE_ERROR, - "ERROR: Plugin bad_plugin contains compilation errors:"). - -files() -> - [ - {copy, "../../rebar", "rebar"}, - {copy, "rebar.config", "rebar.config"}, - {copy, "bad.config", "bad.config"}, - {copy, "fish.erl", "src/fish.erl"}, - {copy, "test_plugin.erl", "plugins/test_plugin.erl"}, - {copy, "bad_plugin.erl", "bad_plugins/bad_plugin.erl"}, - {create, "fwibble.test", <<"fwibble">>}, - {create, "ebin/fish.app", app(fish, [fish])} - ]. - -run(_Dir) -> - ?assertMatch({ok, _}, retest_sh:run("./rebar fwibble -v", [])), - ?assertEqual(false, filelib:is_regular("fwibble.test")), - Ref = retest:sh("./rebar -C bad.config -v clean", [{async, true}]), - {ok, _} = retest:sh_expect(Ref, "ERROR: Plugin .*bad_plugin.erl " - "contains compilation errors:.*", - [{newline, any}]), - ok. - -%% -%% Generate the contents of a simple .app file -%% -app(Name, Modules) -> - App = {application, Name, - [{description, atom_to_list(Name)}, - {vsn, "1"}, - {modules, Modules}, - {registered, []}, - {applications, [kernel, stdlib]}]}, - io_lib:format("~p.\n", [App]). -- cgit v1.1