From ac0192fbd1d4924d3b3b693185d733f89e04baf7 Mon Sep 17 00:00:00 2001 From: Christopher Meiklejohn Date: Mon, 19 May 2014 16:12:41 -0400 Subject: [PATCH] Adapt riak_test for riak_core applications. Adapt riak_test to more easily be used with riak_core based applications. This involves removing a few assumptions about executable names. --- src/rtdev.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rtdev.erl b/src/rtdev.erl index f64e30c7a..8974ceebf 100644 --- a/src/rtdev.erl +++ b/src/rtdev.erl @@ -31,7 +31,8 @@ get_deps() -> lists:flatten(io_lib:format("~s/dev/dev1/lib", [relpath(current)])). riakcmd(Path, N, Cmd) -> - io_lib:format("~s/dev/dev~b/bin/riak ~s", [Path, N, Cmd]). + ExecName = rt_config:get(exec_name, "riak"), + io_lib:format("~s/dev/dev~b/bin/~s ~s", [Path, N, ExecName, Cmd]). riakreplcmd(Path, N, Cmd) -> io_lib:format("~s/dev/dev~b/bin/riak-repl ~s", [Path, N, Cmd]). @@ -48,7 +49,8 @@ riak_admin_cmd(Path, N, Args) -> erlang:error(badarg) end, Args), ArgStr = string:join(Quoted, " "), - io_lib:format("~s/dev/dev~b/bin/riak-admin ~s", [Path, N, ArgStr]). + ExecName = rt_config:get(exec_name, "riak"), + io_lib:format("~s/dev/dev~b/bin/~s-admin ~s", [Path, N, ExecName, ArgStr]). run_git(Path, Cmd) -> lager:info("Running: ~s", [gitcmd(Path, Cmd)]),