mirror of
https://github.com/correl/rebar.git
synced 2024-11-14 19:19:30 +00:00
Merge branch 'NineFX-erl-args-to-end'
This commit is contained in:
commit
7f7e36740f
6 changed files with 25 additions and 11 deletions
1
THANKS
1
THANKS
|
@ -126,3 +126,4 @@ Yuki Ito
|
|||
alisdair sullivan
|
||||
Alexander Verbitsky
|
||||
Andras Horvath
|
||||
Drew Varner
|
||||
|
|
2
inttest/ct1/app.config
Normal file
2
inttest/ct1/app.config
Normal file
|
@ -0,0 +1,2 @@
|
|||
%% This file is an application config file, not a CT test config file
|
||||
[{a1, [{foo, bar}]}].
|
|
@ -7,10 +7,12 @@ files() ->
|
|||
[{create, "ebin/a1.app", app(a1)},
|
||||
{copy, "../../rebar", "rebar"},
|
||||
{copy, "rebar.config", "rebar.config"},
|
||||
{copy, "app.config", "app.config"},
|
||||
{copy, "test_SUITE.erl", "itest/test_SUITE.erl"}].
|
||||
|
||||
run(_Dir) ->
|
||||
{ok, _} = retest:sh("./rebar compile ct"),
|
||||
{ok, _} = retest:sh("./rebar compile ct -v"),
|
||||
ok.
|
||||
|
||||
|
||||
|
|
|
@ -1 +1,2 @@
|
|||
{ct_dir, "itest"}.
|
||||
{ct_extra_params, "-repeat 2 -erl_args -config app"}.
|
||||
|
|
|
@ -5,7 +5,13 @@
|
|||
-include_lib("ct.hrl").
|
||||
|
||||
all() ->
|
||||
[simple_test].
|
||||
[simple_test,
|
||||
app_config_file_test].
|
||||
|
||||
simple_test(Config) ->
|
||||
io:format("Test: ~p\n", [Config]).
|
||||
|
||||
app_config_file_test(_Config) ->
|
||||
application:start(a1),
|
||||
{ok, bar} = application:get_env(a1, foo),
|
||||
application:stop(a1).
|
||||
|
|
|
@ -217,15 +217,13 @@ make_cmd(TestDir, RawLogDir, Config) ->
|
|||
" ~s"
|
||||
" ~s"
|
||||
" -logdir \"~s\""
|
||||
" -env TEST_DIR \"~s\""
|
||||
" ~s",
|
||||
" -env TEST_DIR \"~s\"",
|
||||
[BaseCmd,
|
||||
CodePathString,
|
||||
Include,
|
||||
build_name(Config),
|
||||
LogDir,
|
||||
filename:join(Cwd, TestDir),
|
||||
get_extra_params(Config)]) ++
|
||||
filename:join(Cwd, TestDir)]) ++
|
||||
get_cover_config(Config, Cwd) ++
|
||||
get_ct_config_file(TestDir) ++
|
||||
get_config_file(TestDir) ++
|
||||
|
@ -237,19 +235,18 @@ make_cmd(TestDir, RawLogDir, Config) ->
|
|||
" ~s"
|
||||
" ~s"
|
||||
" -logdir \"~s\""
|
||||
" -env TEST_DIR \"~s\""
|
||||
" ~s",
|
||||
" -env TEST_DIR \"~s\"",
|
||||
[BaseCmd,
|
||||
CodePathString,
|
||||
Include,
|
||||
build_name(Config),
|
||||
LogDir,
|
||||
filename:join(Cwd, TestDir),
|
||||
get_extra_params(Config)]) ++
|
||||
filename:join(Cwd, TestDir)]) ++
|
||||
SpecFlags ++ get_cover_config(Config, Cwd)
|
||||
end,
|
||||
Cmd1 = Cmd ++ get_extra_params(Config),
|
||||
RawLog = filename:join(LogDir, "raw.log"),
|
||||
{Cmd, RawLog}.
|
||||
{Cmd1, RawLog}.
|
||||
|
||||
build_name(Config) ->
|
||||
case rebar_config:get_local(Config, ct_use_short_names, false) of
|
||||
|
@ -258,7 +255,12 @@ build_name(Config) ->
|
|||
end.
|
||||
|
||||
get_extra_params(Config) ->
|
||||
rebar_config:get_local(Config, ct_extra_params, "").
|
||||
case rebar_config:get_local(Config, ct_extra_params, undefined) of
|
||||
undefined ->
|
||||
"";
|
||||
Defined ->
|
||||
" " ++ Defined
|
||||
end.
|
||||
|
||||
get_ct_specs(Config, Cwd) ->
|
||||
case collect_glob(Config, Cwd, ".*\.test\.spec\$") of
|
||||
|
|
Loading…
Reference in a new issue