From 63b4900da90cd0920b03a9a3dc5f8d8fdbf61ddf Mon Sep 17 00:00:00 2001
From: Andrey Pampukha <andrey@erlang.org>
Date: Wed, 24 Mar 2010 12:42:39 +0100
Subject: Separate config and user_config in test specifications

This is now properly supported in the ct_run.
---
 lib/common_test/src/ct_run.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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}.
-- 
cgit v1.2.3