aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndrey Pampukha <[email protected]>2010-03-24 12:42:39 +0100
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:16 +0200
commit63b4900da90cd0920b03a9a3dc5f8d8fdbf61ddf (patch)
tree93e9e10dafdfded7c48a2f22838891a142909b7b /lib
parent497c107bcdb7095f402d4b9884b0bfc8f9bbe97f (diff)
downloadotp-63b4900da90cd0920b03a9a3dc5f8d8fdbf61ddf.tar.gz
otp-63b4900da90cd0920b03a9a3dc5f8d8fdbf61ddf.tar.bz2
otp-63b4900da90cd0920b03a9a3dc5f8d8fdbf61ddf.zip
Separate config and user_config in test specifications
This is now properly supported in the ct_run.
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/ct_run.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 92c2334a80..5fd89bc499 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -829,6 +829,7 @@ run_testspec1(TestSpec) ->
get_data_for_node(#testspec{logdir=LogDirs,
cover=CoverFs,
config=Cfgs,
+ userconfig=UsrCfgs,
event_handler=EvHs,
include=Incl}, Node) ->
LogDir = case lists:keysearch(Node,1,LogDirs) of
@@ -839,7 +840,8 @@ get_data_for_node(#testspec{logdir=LogDirs,
{value,{Node,CovFile}} -> CovFile;
false -> undef
end,
- ConfigFiles = [F || {N,F} <- Cfgs, N==Node],
+ ConfigFiles = [{?ct_config_txt, F} || {N,F} <- Cfgs, N==Node] ++
+ [CBF || {N, CBF} <- UsrCfgs, N==Node],
EvHandlers = [{H,A} || {N,H,A} <- EvHs, N==Node],
Include = [I || {N,I} <- Incl, N==Node],
{LogDir,Cover,ConfigFiles,EvHandlers,Include}.