diff options
| author | Dave Smith <dizzyd@dizzyd.com> | 2012-06-08 07:11:00 -0700 |
|---|---|---|
| committer | Dave Smith <dizzyd@dizzyd.com> | 2012-06-08 07:11:00 -0700 |
| commit | 9ec6f3744486d26e88ce9d513654b8cfa45c551e (patch) | |
| tree | f42721c4c4899b58637b7cbfea95c0904b4ca03a | |
| parent | a7d64deb4316b06c23e4442f4120b9afea7414a9 (diff) | |
| parent | bebd9d2ae6da04c367e4b7aa976c2b4d4abbd471 (diff) | |
Merge pull request #230 from hyperthunk/ct-name
Support ct_run using short name
| -rw-r--r-- | rebar.config.sample | 3 | ||||
| -rw-r--r-- | src/rebar_ct.erl | 14 |
2 files changed, 13 insertions, 4 deletions
diff --git a/rebar.config.sample b/rebar.config.sample index dc4253b..0e846f9 100644 --- a/rebar.config.sample +++ b/rebar.config.sample @@ -85,6 +85,9 @@ %% Option to pass extra parameters when launching Common Test {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 == %% Which files to cleanup diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl index 4f69a29..27a01e8 100644 --- a/src/rebar_ct.erl +++ b/src/rebar_ct.erl @@ -145,14 +145,14 @@ make_cmd(TestDir, Config) -> undefined -> ?FMT("erl " % should we expand ERL_PATH? " -noshell -pa ~s ~s" - " -name test@~s" + " ~s" " -logdir \"~s\"" " -env TEST_DIR \"~s\"" " ~s" " -s ct_run script_start -s erlang halt", [CodePathString, Include, - net_adm:localhost(), + build_name(Config), LogDir, filename:join(Cwd, TestDir), get_extra_params(Config)]) ++ @@ -164,14 +164,14 @@ make_cmd(TestDir, Config) -> SpecFlags -> ?FMT("erl " % should we expand ERL_PATH? " -noshell -pa ~s ~s" - " -name test@~s" + " ~s" " -logdir \"~s\"" " -env TEST_DIR \"~s\"" " ~s" " -s ct_run script_start -s erlang halt", [CodePathString, Include, - net_adm:localhost(), + build_name(Config), LogDir, filename:join(Cwd, TestDir), get_extra_params(Config)]) ++ @@ -180,6 +180,12 @@ make_cmd(TestDir, Config) -> RawLog = filename:join(LogDir, "raw.log"), {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) -> rebar_config:get_local(Config, ct_extra_params, ""). |