diff --git a/inttest/proto_gpb/proto_gpb_rt.erl b/inttest/proto_gpb/proto_gpb_rt.erl index aafc677..2cc5052 100644 --- a/inttest/proto_gpb/proto_gpb_rt.erl +++ b/inttest/proto_gpb/proto_gpb_rt.erl @@ -48,11 +48,11 @@ files() -> {copy, "rebar.config", "rebar.config"}, {copy, "include", "include"}, {copy, "src", "src"}, + {copy, "mock", "deps"}, {create, "ebin/foo.app", app(foo, ?MODULES ++ ?GENERATED_MODULES)} ]. run(_Dir) -> - ?assertMatch({ok, _}, retest_sh:run("./rebar prepare-deps", [])), ?assertMatch({ok, _}, retest_sh:run("./rebar clean", [])), ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])), %% Foo includes test_gpb.hrl, diff --git a/inttest/proto_gpb/rebar.config b/inttest/proto_gpb/rebar.config index 06ac985..e6ef1f9 100644 --- a/inttest/proto_gpb/rebar.config +++ b/inttest/proto_gpb/rebar.config @@ -8,7 +8,13 @@ {deps, [ - {gpb, [], {rsync, "../../../inttest/proto_gpb/mock/gpb"}} + %% The dependency below to gpb is needed for "rebar compile" to + %% work, thus for the inttest to work, but the gpb that is actually + %% used in inttest is brought in from the inttest/proto_gpb/mock + %% subdirectory, not from the source below. The dependency is + %% needed, but the git url serves mostly as an example. + {gpb, [], {git, "git://github.com/tomas-abrahamsson/gpb", + {branch, "master"}}} ]}. {proto_compiler, gpb}. diff --git a/inttest/proto_protobuffs/proto_protobuffs_rt.erl b/inttest/proto_protobuffs/proto_protobuffs_rt.erl index bd03033..1bb7b5e 100644 --- a/inttest/proto_protobuffs/proto_protobuffs_rt.erl +++ b/inttest/proto_protobuffs/proto_protobuffs_rt.erl @@ -48,11 +48,11 @@ files() -> {copy, "rebar.config", "rebar.config"}, {copy, "include", "include"}, {copy, "src", "src"}, + {copy, "mock", "deps"}, {create, "ebin/foo.app", app(foo, ?MODULES)} ]. run(_Dir) -> - ?assertMatch({ok, _}, retest_sh:run("./rebar prepare-deps", [])), ?assertMatch({ok, _}, retest_sh:run("./rebar clean", [])), ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])), ok = check_beams_generated(), diff --git a/inttest/proto_protobuffs/rebar.config b/inttest/proto_protobuffs/rebar.config index 86813f3..0367ee2 100644 --- a/inttest/proto_protobuffs/rebar.config +++ b/inttest/proto_protobuffs/rebar.config @@ -8,7 +8,13 @@ {deps, [ - {protobuffs, [], {rsync, "../../../inttest/proto_protobuffs/mock/protobuffs"}} + %% The dependency below to protobuffs is needed for "rebar compile" to + %% work, thus for the inttest to work, but the protobuffs that is actually + %% used in inttest is brought in from the inttest/proto_protobuffs/mock + %% subdirectory, not from the source below. The dependency is + %% needed, but the git url serves mostly as an example. + {protobuffs, [], {git, "git://github.com/basho/erlang_protobuffs", + {branch, "master"}}} ]}. %% The default proto compiler is protobuffs