aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2014-02-24 16:14:16 +0100
committerHenrik Nord <henrik@erlang.org>2014-02-24 16:14:44 +0100
commit109a06739bdbb5ca1e21cea2d4cf288fc0848d57 (patch)
tree25abfecf02dfb64fa2e5c0d8d47fce5c739e95cf /lib/common_test
parentca693a05bda78d701ff8b47d851505098c79c077 (diff)
parentf2169928a77d5a6b2e3e069b8cf9b8f5300ed543 (diff)
downloadotp-109a06739bdbb5ca1e21cea2d4cf288fc0848d57.tar.gz
otp-109a06739bdbb5ca1e21cea2d4cf288fc0848d57.tar.bz2
otp-109a06739bdbb5ca1e21cea2d4cf288fc0848d57.zip
Merge branch 'fenollp/otp-edoc-usage-fixes'
* fenollp/otp-edoc-usage-fixes: Fix edoc usage errors OTP-11702
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/src/ct_framework.erl2
-rw-r--r--lib/common_test/src/ct_logs.erl2
-rw-r--r--lib/common_test/src/ct_util.erl5
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 54510a657a..580588fbd2 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -1417,7 +1417,7 @@ warn(_What) ->
true.
%%%-----------------------------------------------------------------
-%%% @spec add_data_dir(File0) -> File1
+%%% @spec add_data_dir(File0, Config) -> File1
add_data_dir(File,Config) when is_atom(File) ->
add_data_dir(atom_to_list(File),Config);
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index a7fb45a4e4..a4ad65c0a4 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -76,7 +76,7 @@
tests = []}).
%%%-----------------------------------------------------------------
-%%% @spec init(Mode) -> Result
+%%% @spec init(Mode, Verbosity) -> Result
%%% Mode = normal | interactive
%%% Result = {StartTime,LogDir}
%%% StartTime = term()
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index ac9857487d..f5eb3a72f0 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -77,6 +77,8 @@
-record(suite_data, {key,name,value}).
%%%-----------------------------------------------------------------
+start() ->
+ start(normal, ".", ?default_verbosity).
%%% @spec start(Mode) -> Pid | exit(Error)
%%% Mode = normal | interactive
%%% Pid = pid()
@@ -91,9 +93,6 @@
%%% <code>ct_util_server</code>.</p>
%%%
%%% @see ct
-start() ->
- start(normal, ".", ?default_verbosity).
-
start(LogDir) when is_list(LogDir) ->
start(normal, LogDir, ?default_verbosity);
start(Mode) ->