aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/ct_config_SUITE.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-10-19 17:22:07 +0200
committerPeter Andersson <[email protected]>2012-11-19 11:14:45 +0100
commit4a0600126b78a7083cb380c5d9efcdd364f551f8 (patch)
tree7942d116261b89aedc564d44a1ca83040e32e590 /lib/common_test/test/ct_config_SUITE.erl
parent41d6a59fb11c65da9edcf97551b19cbdbf00646f (diff)
downloadotp-4a0600126b78a7083cb380c5d9efcdd364f551f8.tar.gz
otp-4a0600126b78a7083cb380c5d9efcdd364f551f8.tar.bz2
otp-4a0600126b78a7083cb380c5d9efcdd364f551f8.zip
Fix problem with config start option not accepting list of files
OTP-10495
Diffstat (limited to 'lib/common_test/test/ct_config_SUITE.erl')
-rw-r--r--lib/common_test/test/ct_config_SUITE.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index 1e1df908db..d92be9ec6e 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -88,8 +88,8 @@ require(Config) when is_list(Config) ->
DataDir = ?config(data_dir, Config),
run_test(config_static_SUITE,
Config,
- [{config, filename:join(DataDir, "config/shadow.txt")},
- {config, filename:join(DataDir, "config/config.txt")}],
+ [{config, [filename:join(DataDir, "config/shadow.txt"),
+ filename:join(DataDir, "config/config.txt")]}],
["config_static_SUITE"]).
install_config(Config) when is_list(Config) ->
@@ -174,6 +174,7 @@ run_test(Name, Config, CTConfig, SuiteNames)->
Joiner = fun(Suite) -> filename:join(DataDir, "config/test/"++Suite) end,
Suites = lists:map(Joiner, SuiteNames),
{Opts,ERPid} = setup_env({suite,Suites}, Config, CTConfig),
+
ok = ct_test_support:run(Opts, Config),
TestEvents = ct_test_support:get_events(ERPid, Config),
ct_test_support:log_events(Name,