diff options
| author | varnerac-ubnt <drew.varner@ubnt.com> | 2014-06-27 12:26:25 -0500 |
|---|---|---|
| committer | varnerac-ubnt <drew.varner@ubnt.com> | 2014-06-27 15:35:56 -0500 |
| commit | 35ee4571760ec7bd3bad9741d982699798bee1dc (patch) | |
| tree | 71af55c8230fa770a400c6b18fbd67af74b9236c /inttest/ct1 | |
| parent | 6e24cd6ac7f8ba9b125c4898e29fa1e9a207f7d2 (diff) | |
Fix bug 271
Moves ct_extra_params to the end of the generated ct_run command.
This allows users to pass commands to the underlying emulator
using -erl_args. The included rt test demonstrates that it is
possible to pass an addtional option to ct_run and -erl_args at
the same time. Finally, the test executes in regular and verbose
modes because rebar constructs the ct_run command differently in
verbose mode.
Diffstat (limited to 'inttest/ct1')
| -rw-r--r-- | inttest/ct1/app.config | 2 | ||||
| -rw-r--r-- | inttest/ct1/ct1_rt.erl | 2 | ||||
| -rw-r--r-- | inttest/ct1/rebar.config | 1 | ||||
| -rw-r--r-- | inttest/ct1/test_SUITE.erl | 8 |
4 files changed, 12 insertions, 1 deletions
diff --git a/inttest/ct1/app.config b/inttest/ct1/app.config new file mode 100644 index 0000000..bb718b2 --- /dev/null +++ b/inttest/ct1/app.config @@ -0,0 +1,2 @@ +%% This file is an application config file, not a CT test config file +[{a1, [{foo, bar}]}]. diff --git a/inttest/ct1/ct1_rt.erl b/inttest/ct1/ct1_rt.erl index f173d3f..f9de372 100644 --- a/inttest/ct1/ct1_rt.erl +++ b/inttest/ct1/ct1_rt.erl @@ -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. diff --git a/inttest/ct1/rebar.config b/inttest/ct1/rebar.config index a4b5284..58047ba 100644 --- a/inttest/ct1/rebar.config +++ b/inttest/ct1/rebar.config @@ -1 +1,2 @@ {ct_dir, "itest"}. +{ct_extra_params, "-repeat 2 -erl_args -config app"}. diff --git a/inttest/ct1/test_SUITE.erl b/inttest/ct1/test_SUITE.erl index 92f2b2e..e8a2bb8 100644 --- a/inttest/ct1/test_SUITE.erl +++ b/inttest/ct1/test_SUITE.erl @@ -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). |