diff options
| author | Andrey Pampukha <[email protected]> | 2010-03-24 11:35:59 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-06-09 16:19:16 +0200 |
| commit | 497c107bcdb7095f402d4b9884b0bfc8f9bbe97f (patch) | |
| tree | e727a22eb45d5d5df0072cfcbdaac5a09ff7cdc1 /lib/common_test/src/ct_testspec.erl | |
| parent | 743d8c90b1f7420fb29077daacf959b018cb4086 (diff) | |
| download | otp-497c107bcdb7095f402d4b9884b0bfc8f9bbe97f.tar.gz otp-497c107bcdb7095f402d4b9884b0bfc8f9bbe97f.tar.bz2 otp-497c107bcdb7095f402d4b9884b0bfc8f9bbe97f.zip | |
Add support for user_config in ct_master
Diffstat (limited to 'lib/common_test/src/ct_testspec.erl')
| -rw-r--r-- | lib/common_test/src/ct_testspec.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl index cd7fe04738..a0da079c54 100644 --- a/lib/common_test/src/ct_testspec.erl +++ b/lib/common_test/src/ct_testspec.erl @@ -446,8 +446,7 @@ add_tests([{config,Node,[F|Fs]}|Ts],Spec) when is_list(F) -> Cfgs = Spec#testspec.config, Node1 = ref2node(Node,Spec#testspec.nodes), add_tests([{config,Node,Fs}|Ts], - Spec#testspec{config=[{Node1,{?ct_config_txt, - get_absfile(?ct_config_txt, F,Spec)}}|Cfgs]}); + Spec#testspec{config=[{Node1,get_absfile(F,Spec)}|Cfgs]}); add_tests([{config,_Node,[]}|Ts],Spec) -> add_tests(Ts,Spec); add_tests([{config,Node,F}|Ts],Spec) -> @@ -455,6 +454,7 @@ add_tests([{config,Node,F}|Ts],Spec) -> add_tests([{config,Files}|Ts],Spec) -> add_tests([{config,all_nodes,Files}|Ts],Spec); + %% --- userconfig --- add_tests([{userconfig,all_nodes,CBF}|Ts],Spec) -> Tests = lists:map(fun(N) -> {userconfig,N,CBF} end, list_nodes(Spec)), @@ -463,10 +463,10 @@ add_tests([{userconfig,Nodes,CBF}|Ts],Spec) when is_list(Nodes) -> Ts1 = separate(Nodes,userconfig,[CBF],Ts,Spec#testspec.nodes), add_tests(Ts1,Spec); add_tests([{userconfig,Node,[{Callback, Config}|CBF]}|Ts],Spec) -> - Cfgs = Spec#testspec.config, + Cfgs = Spec#testspec.userconfig, Node1 = ref2node(Node,Spec#testspec.nodes), add_tests([{userconfig,Node,CBF}|Ts], - Spec#testspec{config=[{Node1,{Callback, + Spec#testspec{userconfig=[{Node1,{Callback, get_absfile(Callback, Config ,Spec)}}|Cfgs]}); add_tests([{userconfig,_Node,[]}|Ts],Spec) -> add_tests(Ts,Spec); |