aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src
diff options
context:
space:
mode:
authorAndrey Pampukha <[email protected]>2010-03-11 14:21:51 +0100
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:10 +0200
commite04b9be7167841c7eaefcfb7eee5b4bc2eb3a943 (patch)
tree98845383ba44ca1be74593c65cef275fb2e76cbd /lib/common_test/src
parent5b66bed40bd374dfcaa5e5669adf338734d812a3 (diff)
downloadotp-e04b9be7167841c7eaefcfb7eee5b4bc2eb3a943.tar.gz
otp-e04b9be7167841c7eaefcfb7eee5b4bc2eb3a943.tar.bz2
otp-e04b9be7167841c7eaefcfb7eee5b4bc2eb3a943.zip
Add tests for test specifications
Diffstat (limited to 'lib/common_test/src')
-rwxr-xr-xlib/common_test/src/ct_config.erl3
-rw-r--r--lib/common_test/src/ct_testspec.erl29
2 files changed, 23 insertions, 9 deletions
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index bc57930381..4b99d8db88 100755
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -204,7 +204,6 @@ get_config_file_list(Opts)->
CfgFiles.
read_config_files(Opts) ->
- %ct:pal("ct_config:read_config_files/1:~nOpts:~n~p", [Opts]),
AddCallback = fun(CallBack, [])->
[{CallBack, []}];
(CallBack, Files)->
@@ -220,7 +219,6 @@ read_config_files(Opts) ->
false->
[]
end,
- %ct:pal("ct_config:read_config_files/1:~nConfigFiles:~n~p", [ConfigFiles]),
read_config_files_int(ConfigFiles, fun store_config/3).
read_config_files_int([{Callback, File}|Files], FunToSave)->
@@ -687,7 +685,6 @@ check_callback_load(Callback)->
end.
check_config_files(Configs)->
- ct:pal("ct_config:check_config_files/1~nConfigs:~n~p", [Configs]),
lists:keysearch(nok, 1,
lists:flatten(
lists:map(fun({Callback, Files})->
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index 8a384a1b3a..ea30ccc13b 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -305,6 +305,28 @@ get_global([{node,Ref,Node}|Ts],Spec=#testspec{nodes=Refs}) ->
get_global([_|Ts],Spec) -> get_global(Ts,Spec);
get_global([],Spec) -> Spec.
+% TODO probably we can terminate here, if any problem with the filename
+% anyway, later ct_run will do it for us :-)
+get_absfile(Callback, FullName,#testspec{spec_dir=SpecDir}) ->
+ % we need to temporary switch to new cwd here, because
+ % otherwise config files cannot be found
+ {ok, OldWd} = file:get_cwd(),
+ ok = file:set_cwd(SpecDir),
+ R = Callback:check_parameter(FullName),
+ ok = file:set_cwd(OldWd),
+ case R of
+ {ok, {file, FullName}}->
+ File = filename:basename(FullName),
+ Dir = get_absname(filename:dirname(FullName),SpecDir),
+ filename:join(Dir,File);
+ {ok, {config, FullName}}->
+ FullName;
+ {nok, {nofile, FullName}}->
+ FullName;
+ {nok, {wrong_config, FullName}}->
+ FullName
+ end.
+
get_absfile(FullName,#testspec{spec_dir=SpecDir}) ->
File = filename:basename(FullName),
Dir = get_absname(filename:dirname(FullName),SpecDir),
@@ -430,12 +452,7 @@ add_tests([{config,Node,[{Callback,F}|Fs]}|Ts],Spec) when is_list(F) ->
Cfgs = Spec#testspec.config,
Node1 = ref2node(Node,Spec#testspec.nodes),
add_tests([{config,Node,Fs}|Ts],
-% TODO FIX IT SOMEHOW! There SHOULD be absolute paths,
-% but it can't be applied to the config parameters
-% probably, that's a good idea to call Callback:check_parameter/1
-% and proceed according to the results
-% Spec#testspec{config=[{Node1,{Callback, get_absfile(F,Spec)}}|Cfgs]});
- Spec#testspec{config=[{Node1,{Callback,[F]}}|Cfgs]});
+ Spec#testspec{config=[{Node1,{Callback, [get_absfile(Callback, F,Spec)]}}|Cfgs]});
add_tests([{config,_Node,[]}|Ts],Spec) ->
%io:format("4: add_tests([{config,_,[]}|~p],~p)~n", [Ts, Spec]),
add_tests(Ts,Spec);