Merge commit 'upstream/master'

3 files changed, 37 insertions, 0 deletions

diff --git a/inttest/ct2/ct2_rt.erl b/inttest/ct2/ct2_rt.erl
new file mode 100644
index 0000000..2b14ff9
--- /dev/null
+++ b/inttest/ct2/ct2_rt.erl
@@ -0,0 +1,26 @@
+-module(ct2_rt).
+
+-compile(export_all).
+
+
+files() ->
+    [{create, "ebin/foo.app", app(foo)},
+     {copy, "../../rebar", "rebar"},
+     {copy, "foo.test.spec", "test/foo.test.spec"},
+     {copy, "foo_SUITE.erl", "test/foo_SUITE.erl"}].
+
+run(_Dir) ->
+    {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/ct2/foo.test.spec b/inttest/ct2/foo.test.spec
new file mode 100644
index 0000000..f3e4cb0
--- /dev/null
+++ b/inttest/ct2/foo.test.spec
@@ -0,0 +1 @@
+{suites, "test", all}.
diff --git a/inttest/ct2/foo_SUITE.erl b/inttest/ct2/foo_SUITE.erl
new file mode 100644
index 0000000..d03aedf
--- /dev/null
+++ b/inttest/ct2/foo_SUITE.erl
@@ -0,0 +1,10 @@
+-module(foo_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+
+-compile(export_all).
+
+all() -> [foo].
+
+foo(Config) ->
+    io:format("Test: ~p\n", [Config]).