From a678b1e658330253ceac51c12a8cd7e2684ddf87 Mon Sep 17 00:00:00 2001
From: Fred Hebert <mononcqc@ferd.ca>
Date: Mon, 29 Dec 2014 02:26:15 +0000
Subject: Adding tests for checkouts being found & compiled

---
 test/rebar_compile_SUITE.erl | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'test/rebar_compile_SUITE.erl')

diff --git a/test/rebar_compile_SUITE.erl b/test/rebar_compile_SUITE.erl
index d67be77..32abd44 100644
--- a/test/rebar_compile_SUITE.erl
+++ b/test/rebar_compile_SUITE.erl
@@ -6,7 +6,8 @@
          init_per_testcase/2,
          all/0,
          build_basic_app/1,
-         build_release_apps/1]).
+         build_release_apps/1,
+         build_checkout_apps/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -25,7 +26,7 @@ init_per_testcase(_, Config) ->
     rebar_test_utils:init_rebar_state(Config).
 
 all() ->
-    [build_basic_app, build_release_apps].
+    [build_basic_app, build_release_apps, build_checkout_apps].
 
 build_basic_app(Config) ->
     AppDir = ?config(apps, Config),
@@ -39,10 +40,10 @@ build_basic_app(Config) ->
 build_release_apps(Config) ->
     AppDir = ?config(apps, Config),
 
-    Name1 = rebar_test_utils:create_random_name("app1_"),
+    Name1 = rebar_test_utils:create_random_name("relapp1_"),
     Vsn1 = rebar_test_utils:create_random_vsn(),
     rebar_test_utils:create_app(filename:join([AppDir,Name1]), Name1, Vsn1, [kernel, stdlib]),
-    Name2 = rebar_test_utils:create_random_name("app2_"),
+    Name2 = rebar_test_utils:create_random_name("relapp2_"),
     Vsn2 = rebar_test_utils:create_random_vsn(),
     rebar_test_utils:create_app(filename:join([AppDir,Name2]), Name2, Vsn2, [kernel, stdlib]),
 
@@ -50,3 +51,19 @@ build_release_apps(Config) ->
         Config, [], ["compile"],
         {ok, [{app, Name1}, {app, Name2}]}
     ).
+
+build_checkout_apps(Config) ->
+    AppDir = ?config(apps, Config),
+    CheckoutsDir = ?config(checkouts, Config),
+    Name1 = rebar_test_utils:create_random_name("checkapp1_"),
+    Vsn1 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir,Name1]), Name1, Vsn1, [kernel, stdlib]),
+    Name2 = rebar_test_utils:create_random_name("checkapp2_"),
+    Vsn2 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([CheckoutsDir,Name2]), Name2, Vsn2, [kernel, stdlib]),
+
+    rebar_test_utils:run_and_check(
+        Config, [], ["compile"],
+        {ok, [{app, Name1}, {checkout, Name2}]}
+    ).
+
-- 
cgit v1.1


From a945143bb4200f78a94c6f7a492e5fad72dce4a6 Mon Sep 17 00:00:00 2001
From: Fred Hebert <mononcqc@ferd.ca>
Date: Mon, 29 Dec 2014 02:57:42 +0000
Subject: MORE TESTS

---
 test/rebar_compile_SUITE.erl | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'test/rebar_compile_SUITE.erl')

diff --git a/test/rebar_compile_SUITE.erl b/test/rebar_compile_SUITE.erl
index 32abd44..627e834 100644
--- a/test/rebar_compile_SUITE.erl
+++ b/test/rebar_compile_SUITE.erl
@@ -7,7 +7,8 @@
          all/0,
          build_basic_app/1,
          build_release_apps/1,
-         build_checkout_apps/1]).
+         build_checkout_apps/1,
+         build_checkout_deps/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -26,7 +27,8 @@ init_per_testcase(_, Config) ->
     rebar_test_utils:init_rebar_state(Config).
 
 all() ->
-    [build_basic_app, build_release_apps, build_checkout_apps].
+    [build_basic_app, build_release_apps,
+     build_checkout_apps, build_checkout_deps].
 
 build_basic_app(Config) ->
     AppDir = ?config(apps, Config),
@@ -67,3 +69,22 @@ build_checkout_apps(Config) ->
         {ok, [{app, Name1}, {checkout, Name2}]}
     ).
 
+build_checkout_deps(Config) ->
+    AppDir = ?config(apps, Config),
+    CheckoutsDir = ?config(checkouts, Config),
+    DepsDir = filename:join([AppDir, "_build", "lib"]),
+    Name1 = rebar_test_utils:create_random_name("checkapp1_"),
+    Vsn1 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([AppDir,Name1]), Name1, Vsn1, [kernel, stdlib]),
+    Name2 = rebar_test_utils:create_random_name("checkapp2_"),
+    Vsn2 = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(filename:join([CheckoutsDir,Name2]), Name2, Vsn2, [kernel, stdlib]),
+    rebar_test_utils:create_app(filename:join([DepsDir,Name2]), Name2, Vsn1, [kernel, stdlib]),
+
+    rebar_test_utils:run_and_check(
+        Config, [], ["compile"],
+        {ok, [{app, Name1}, {checkout, Name2}]}
+    ),
+    ok = application:load(list_to_atom(Name2)),
+    Loaded = application:loaded_applications(),
+    {_, _, Vsn2} = lists:keyfind(list_to_atom(Name2), 1, Loaded).
-- 
cgit v1.1