github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-27 19:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support ct_run using short name

Browse source 
Not every system under test can be run with long names, and this makes
rebar's common_test support useless in those environments, as it
currently uses long names (test@hostname.domain) by default, without
recourse to change them.

This patch adds support for a {ct_use_short_names, boolean()} config
variable, which allows the user to specify whether short or long names
are required.
This commit is contained in:
Tim Watson 2012-05-22 15:50:26 +01:00
parent 635d1a9456
commit bebd9d2ae6
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rebar.config.sample
View file

@ -85,6 +85,9 @@
%% Option to pass extra parameters when launching Common Test %% Option to pass extra parameters when launching Common Test
{ct_extra_params, "-boot start_sasl -s myapp"}. {ct_extra_params, "-boot start_sasl -s myapp"}.
%% Option to use short names (i.e., -sname test) when starting ct
{ct_use_short_names, true}.
%% == Cleanup == %% == Cleanup ==
%% Which files to cleanup %% Which files to cleanup

14
src/rebar_ct.erl
View file

@ -145,14 +145,14 @@ make_cmd(TestDir, Config) ->
undefined -> undefined ->
?FMT("erl " % should we expand ERL_PATH? ?FMT("erl " % should we expand ERL_PATH?
" -noshell -pa ~s ~s" " -noshell -pa ~s ~s"
" -name test@~s" " ~s"
" -logdir \"~s\"" " -logdir \"~s\""
" -env TEST_DIR \"~s\"" " -env TEST_DIR \"~s\""
" ~s" " ~s"
" -s ct_run script_start -s erlang halt", " -s ct_run script_start -s erlang halt",
[CodePathString, [CodePathString,
Include, Include,
net_adm:localhost(), build_name(Config),
LogDir, LogDir,
filename:join(Cwd, TestDir), filename:join(Cwd, TestDir),
get_extra_params(Config)]) ++ get_extra_params(Config)]) ++
@ -164,14 +164,14 @@ make_cmd(TestDir, Config) ->
SpecFlags -> SpecFlags ->
?FMT("erl " % should we expand ERL_PATH? ?FMT("erl " % should we expand ERL_PATH?
" -noshell -pa ~s ~s" " -noshell -pa ~s ~s"
" -name test@~s" " ~s"
" -logdir \"~s\"" " -logdir \"~s\""
" -env TEST_DIR \"~s\"" " -env TEST_DIR \"~s\""
" ~s" " ~s"
" -s ct_run script_start -s erlang halt", " -s ct_run script_start -s erlang halt",
[CodePathString, [CodePathString,
Include, Include,
net_adm:localhost(), build_name(Config),
LogDir, LogDir,
filename:join(Cwd, TestDir), filename:join(Cwd, TestDir),
get_extra_params(Config)]) ++ get_extra_params(Config)]) ++
@ -180,6 +180,12 @@ make_cmd(TestDir, Config) ->
RawLog = filename:join(LogDir, "raw.log"), RawLog = filename:join(LogDir, "raw.log"),
{Cmd, RawLog}. {Cmd, RawLog}.
build_name(Config) ->
case rebar_config:get_local(Config, ct_use_short_names, false) of
true -> "-sname test";
false -> " -name test@" ++ net_adm:localhost()
end.
get_extra_params(Config) -> get_extra_params(Config) ->
rebar_config:get_local(Config, ct_extra_params, ""). rebar_config:get_local(Config, ct_extra_params, "").