aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erix.ericsson.se>2010-10-15 11:23:24 +0200
committerLukas Larsson <lukas@erix.ericsson.se>2010-10-15 11:23:24 +0200
commit4c62aab79bdd9cb7016a965b6980255f50c7fbb8 (patch)
tree6a476b23750407b649e8f265f846fd9f059bf61b /lib
parentdf5668c38ad9af74932417d00e80b6285cc7057a (diff)
parenta5c459a66fdbd9230c79220265af7adf5413cf52 (diff)
downloadotp-4c62aab79bdd9cb7016a965b6980255f50c7fbb8.tar.gz
otp-4c62aab79bdd9cb7016a965b6980255f50c7fbb8.tar.bz2
otp-4c62aab79bdd9cb7016a965b6980255f50c7fbb8.zip
Merge branch 'lukas/common_test/ct_get_status_docs/OTP-8895' into dev
* lukas/common_test/ct_get_status_docs/OTP-8895: Update get_status doc to include no_tests_running
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/ct.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 8ae175f10d..1dbf83ee10 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -694,7 +694,7 @@ userdata(TestDir, Suite, Case) ->
%%%-----------------------------------------------------------------
-%%% @spec get_status() -> TestStatus | {error,Reason}
+%%% @spec get_status() -> TestStatus | {error,Reason} | no_tests_running
%%% TestStatus = [StatusElem]
%%% StatusElem = {current,{Suite,TestCase}} | {successful,Successful} |
%%% {failed,Failed} | {skipped,Skipped} | {total,Total}