diff options
| author | Peter Andersson <[email protected]> | 2016-07-12 12:55:08 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2016-07-23 10:40:32 +0200 |
| commit | dbb3b87a74992ca5e3e678ba747ccea6411c3f57 (patch) | |
| tree | f2f90efda0cbcdf6b1f600244c04eff9823724c4 /lib/common_test/src/ct_logs.erl | |
| parent | 5cf780148575f1ea4c460d7c9783831e6fbce9ff (diff) | |
| download | otp-dbb3b87a74992ca5e3e678ba747ccea6411c3f57.tar.gz otp-dbb3b87a74992ca5e3e678ba747ccea6411c3f57.tar.bz2 otp-dbb3b87a74992ca5e3e678ba747ccea6411c3f57.zip | |
Fix error with duplicated printouts by ct_telnet:expect/3
OTP-13730
Diffstat (limited to 'lib/common_test/src/ct_logs.erl')
| -rw-r--r-- | lib/common_test/src/ct_logs.erl | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index a9ad571bfc..d87d26e5ba 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -32,7 +32,7 @@ -export([init/2, close/2, init_tc/1, end_tc/1]). -export([register_groupleader/2, unregister_groupleader/1]). -export([get_log_dir/0, get_log_dir/1]). --export([log/3, start_log/1, cont_log/2, end_log/0]). +-export([log/3, start_log/1, cont_log/2, cont_log_no_timestamp/2, end_log/0]). -export([set_stylesheet/2, clear_stylesheet/1]). -export([add_external_logs/1, add_link/3]). -export([make_last_run_index/0]). @@ -358,6 +358,20 @@ cont_log(Format,Args) -> ok. %%%----------------------------------------------------------------- +%%% @spec cont_log_no_timestamp(Format,Args) -> ok +%%% +%%% @doc Adds information about an activity (tool-internal use only). +%%% +%%% @see start_log/1 +%%% @see end_log/0 +cont_log_no_timestamp([],[]) -> + ok; +cont_log_no_timestamp(Format,Args) -> + cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE, + [{Format,Args}],true}), + ok. + +%%%----------------------------------------------------------------- %%% @spec end_log() -> ok %%% %%% @doc Ends the logging of an activity (tool-internal use only). @@ -580,7 +594,6 @@ div_header(Class,Printer) -> div_footer() -> "</pre></div>\n<pre>". - maybe_log_timestamp() -> {MS,S,US} = ?now, case get(log_timestamp) of |