summaryrefslogtreecommitdiff
path: root/inttest
diff options
context:
space:
mode:
Diffstat (limited to 'inttest')
-rw-r--r--inttest/ct1/rebar.config1
-rw-r--r--inttest/ct2/ct2_rt.erl4
-rw-r--r--inttest/t_custom_config/custom.config1
-rw-r--r--inttest/t_custom_config/t_custom_config_rt.erl9
-rw-r--r--inttest/tdeps1/a.erl1
-rw-r--r--inttest/tdeps1/a.rebar.config1
-rw-r--r--inttest/tdeps1/b.hrl2
-rw-r--r--inttest/tdeps1/b.rebar.config1
-rw-r--r--inttest/tdeps1/c.hrl1
-rw-r--r--inttest/tdeps1/tdeps1_rt.erl3
-rw-r--r--inttest/tdeps2/a.erl1
-rw-r--r--inttest/tdeps2/a.rebar.config1
-rw-r--r--inttest/tdeps2/b.hrl2
-rw-r--r--inttest/tdeps2/b.rebar.config1
-rw-r--r--inttest/tdeps2/c.hrl1
-rw-r--r--inttest/tdeps2/tdeps2_rt.erl3
16 files changed, 7 insertions, 26 deletions
diff --git a/inttest/ct1/rebar.config b/inttest/ct1/rebar.config
index 839fe4b..a4b5284 100644
--- a/inttest/ct1/rebar.config
+++ b/inttest/ct1/rebar.config
@@ -1,2 +1 @@
-
{ct_dir, "itest"}.
diff --git a/inttest/ct2/ct2_rt.erl b/inttest/ct2/ct2_rt.erl
index 2b14ff9..ecab0e4 100644
--- a/inttest/ct2/ct2_rt.erl
+++ b/inttest/ct2/ct2_rt.erl
@@ -6,11 +6,11 @@
files() ->
[{create, "ebin/foo.app", app(foo)},
{copy, "../../rebar", "rebar"},
- {copy, "foo.test.spec", "test/foo.test.spec"},
+ {copy, "foo.test.spec", "foo.test.spec"},
{copy, "foo_SUITE.erl", "test/foo_SUITE.erl"}].
run(_Dir) ->
- {ok, _} = retest:sh("./rebar compile ct -v"),
+ {ok, _} = retest:sh("./rebar compile ct -vvv"),
ok.
%%
diff --git a/inttest/t_custom_config/custom.config b/inttest/t_custom_config/custom.config
index 8c60b5e..711c27f 100644
--- a/inttest/t_custom_config/custom.config
+++ b/inttest/t_custom_config/custom.config
@@ -1,4 +1,3 @@
-
{deps, [
{boo, "."}
]}.
diff --git a/inttest/t_custom_config/t_custom_config_rt.erl b/inttest/t_custom_config/t_custom_config_rt.erl
index db1b29a..864ce5e 100644
--- a/inttest/t_custom_config/t_custom_config_rt.erl
+++ b/inttest/t_custom_config/t_custom_config_rt.erl
@@ -11,16 +11,17 @@ files() ->
run(Dir) ->
retest_log:log(debug, "Running in Dir: ~s~n", [Dir]),
- Ref = retest:sh("./rebar -C custom.config check-deps -vvv", [{async, true}]),
+ Ref = retest:sh("./rebar -C custom.config check-deps -vvv",
+ [{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\\}\\]",
- [{capture, all, list}]),
+ "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.
diff --git a/inttest/tdeps1/a.erl b/inttest/tdeps1/a.erl
index e64b16d..835522a 100644
--- a/inttest/tdeps1/a.erl
+++ b/inttest/tdeps1/a.erl
@@ -6,4 +6,3 @@
hello() ->
io:format("~s\n", [?HELLO]).
-
diff --git a/inttest/tdeps1/a.rebar.config b/inttest/tdeps1/a.rebar.config
index afeef7a..01609ee 100644
--- a/inttest/tdeps1/a.rebar.config
+++ b/inttest/tdeps1/a.rebar.config
@@ -1,2 +1 @@
{deps, [{b, "1", {hg, "../repo/b", "tip"}}]}.
-
diff --git a/inttest/tdeps1/b.hrl b/inttest/tdeps1/b.hrl
index 897f348..efbeab1 100644
--- a/inttest/tdeps1/b.hrl
+++ b/inttest/tdeps1/b.hrl
@@ -1,3 +1 @@
-
-include_lib("c/include/c.hrl").
-
diff --git a/inttest/tdeps1/b.rebar.config b/inttest/tdeps1/b.rebar.config
index ced29cc..59c8987 100644
--- a/inttest/tdeps1/b.rebar.config
+++ b/inttest/tdeps1/b.rebar.config
@@ -1,2 +1 @@
{deps, [{c, "1", {hg, "../repo/c", "tip"}}]}.
-
diff --git a/inttest/tdeps1/c.hrl b/inttest/tdeps1/c.hrl
index 84cf2d4..9f02fab 100644
--- a/inttest/tdeps1/c.hrl
+++ b/inttest/tdeps1/c.hrl
@@ -1,2 +1 @@
-define(HELLO, hello).
-
diff --git a/inttest/tdeps1/tdeps1_rt.erl b/inttest/tdeps1/tdeps1_rt.erl
index 9072e9c..43184c6 100644
--- a/inttest/tdeps1/tdeps1_rt.erl
+++ b/inttest/tdeps1/tdeps1_rt.erl
@@ -30,14 +30,11 @@ run(_Dir) ->
{ok, _} = retest_sh:run(HgCmd, [{dir, "repo/b"}]),
{ok, _} = retest_sh:run(HgCmd, [{dir, "repo/c"}]),
-
{ok, _} = retest_sh:run("./rebar get-deps compile", []),
true = filelib:is_regular("ebin/a.beam"),
ok.
-
-
%%
%% Generate the contents of a simple .app file
%%
diff --git a/inttest/tdeps2/a.erl b/inttest/tdeps2/a.erl
index 29538e0..294ae21 100644
--- a/inttest/tdeps2/a.erl
+++ b/inttest/tdeps2/a.erl
@@ -1,4 +1,3 @@
-module({{module}}).
-include_lib("b/include/b.hrl").
-
diff --git a/inttest/tdeps2/a.rebar.config b/inttest/tdeps2/a.rebar.config
index afeef7a..01609ee 100644
--- a/inttest/tdeps2/a.rebar.config
+++ b/inttest/tdeps2/a.rebar.config
@@ -1,2 +1 @@
{deps, [{b, "1", {hg, "../repo/b", "tip"}}]}.
-
diff --git a/inttest/tdeps2/b.hrl b/inttest/tdeps2/b.hrl
index 897f348..efbeab1 100644
--- a/inttest/tdeps2/b.hrl
+++ b/inttest/tdeps2/b.hrl
@@ -1,3 +1 @@
-
-include_lib("c/include/c.hrl").
-
diff --git a/inttest/tdeps2/b.rebar.config b/inttest/tdeps2/b.rebar.config
index ced29cc..59c8987 100644
--- a/inttest/tdeps2/b.rebar.config
+++ b/inttest/tdeps2/b.rebar.config
@@ -1,2 +1 @@
{deps, [{c, "1", {hg, "../repo/c", "tip"}}]}.
-
diff --git a/inttest/tdeps2/c.hrl b/inttest/tdeps2/c.hrl
index 84cf2d4..9f02fab 100644
--- a/inttest/tdeps2/c.hrl
+++ b/inttest/tdeps2/c.hrl
@@ -1,2 +1 @@
-define(HELLO, hello).
-
diff --git a/inttest/tdeps2/tdeps2_rt.erl b/inttest/tdeps2/tdeps2_rt.erl
index cdf10b5..bad546e 100644
--- a/inttest/tdeps2/tdeps2_rt.erl
+++ b/inttest/tdeps2/tdeps2_rt.erl
@@ -38,12 +38,9 @@ run(_Dir) ->
{ok, _} = retest_sh:run(HgCmd, [{dir, "repo/b"}]),
{ok, _} = retest_sh:run(HgCmd, [{dir, "repo/c"}]),
-
{ok, _} = retest_sh:run("./rebar -v get-deps compile", []),
ok.
-
-
%%
%% Generate the contents of a simple .app file
%%