aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2010-05-27 00:46:37 +0200
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:19 +0200
commit7b33aa92bb2558ba04a6436203638fd46592b8d2 (patch)
treed0ca16d7a4d816aef05300a810703e676ed1a013 /lib/common_test/src
parent80d1a5c5753a18491bfe29740ab5b0af22f0bff2 (diff)
downloadotp-7b33aa92bb2558ba04a6436203638fd46592b8d2.tar.gz
otp-7b33aa92bb2558ba04a6436203638fd46592b8d2.tar.bz2
otp-7b33aa92bb2558ba04a6436203638fd46592b8d2.zip
Improve documentation and fix minor problems
General documentation and code updates.
Diffstat (limited to 'lib/common_test/src')
-rw-r--r--lib/common_test/src/ct_config_plain.erl2
-rw-r--r--lib/common_test/src/ct_config_xml.erl5
-rw-r--r--lib/common_test/src/ct_run.erl46
3 files changed, 4 insertions, 49 deletions
diff --git a/lib/common_test/src/ct_config_plain.erl b/lib/common_test/src/ct_config_plain.erl
index 0fed58e45a..3fbc8af9fb 100644
--- a/lib/common_test/src/ct_config_plain.erl
+++ b/lib/common_test/src/ct_config_plain.erl
@@ -65,7 +65,7 @@ read_config(ConfigFile) ->
end
end.
-% check against existence of config file
+% check if config file exists
check_parameter(File)->
case filelib:is_file(File) of
true->
diff --git a/lib/common_test/src/ct_config_xml.erl b/lib/common_test/src/ct_config_xml.erl
index 4ced80aeac..8a6e75e635 100644
--- a/lib/common_test/src/ct_config_xml.erl
+++ b/lib/common_test/src/ct_config_xml.erl
@@ -33,7 +33,7 @@ read_config(ConfigFile) ->
{error, Error, ErroneousString}
end.
-% check against existence of the file
+% check file exists
check_parameter(File)->
case filelib:is_file(File) of
true->
@@ -107,8 +107,7 @@ transform_entity({Tag, String})->
throw(Error)
end.
-% transform a string with Erlang terms to the terms
-% stolen from trapexit.org :-)
+% transform a string with Erlang terms
list_to_term(String) ->
{ok, T, _} = erl_scan:string(String++"."),
case catch erl_parse:parse_term(T) of
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 4f8e3e1a98..021bda2951 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -101,11 +101,6 @@ script_start() ->
Res.
script_start1(Parent, Args) ->
- case lists:keymember(preload, 1, Args) of
- true -> preload();
- false -> ok
- end,
-
VtsOrShell =
case lists:keymember(vts, 1, Args) of
true ->
@@ -467,7 +462,7 @@ install(Opts, LogDir) ->
case whereis(ct_util_server) of
undefined ->
VarFile = variables_file_name(LogDir),
- io:format("Varfile=~p~n", [VarFile]),
+ %% io:format("Varfile=~p~n", [VarFile]),
case file:open(VarFile, [write]) of
{ok,Fd} ->
[io:format(Fd, "~p.\n", [Opt]) || Opt <- Opts],
@@ -1780,45 +1775,6 @@ stop_trace(true) ->
dbg:stop_clear();
stop_trace(false) ->
ok.
-
-preload() ->
- io:format("~nLoading Common Test and Test Server modules...~n~n"),
- preload_mod([ct_logs,
- ct_make,
- ct_telnet,
- ct,
- ct_master,
- ct_testspec,
- ct_cover,
- ct_master_event,
- ct_util,
- ct_event,
- ct_master_logs,
- ct_framework,
- teln,
- ct_ftp,
- ct_rpc,
- unix_telnet,
- ct_gen_conn,
- ct_line,
- ct_snmp,
- test_server_sup,
- test_server,
- test_server_ctrl,
- test_server_h,
- test_server_line,
- test_server_node]).
-
-preload_mod([M|Ms]) ->
- case code:is_loaded(M) of
- false ->
- {module,M} = code:load_file(M),
- preload_mod(Ms);
- _ ->
- ok
- end;
-preload_mod([]) ->
- ok.
ensure_atom(Atom) when is_atom(Atom) ->
Atom;