diff options
author | Anders Svensson <[email protected]> | 2015-03-05 01:34:41 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2015-03-05 01:34:41 +0100 |
commit | ac82610a03c8b17b6bcae91aa4252a1930c51e85 (patch) | |
tree | 23c9bd58e6792ed656af6889cafbda8805377b55 /lib/diameter/test/diameter_ct.erl | |
parent | 2456cf80733d3ee5d1c0dca3c52366166d8ad2b6 (diff) | |
parent | 71b52f31772210a7160317966ca46e36140b935a (diff) | |
download | otp-ac82610a03c8b17b6bcae91aa4252a1930c51e85.tar.gz otp-ac82610a03c8b17b6bcae91aa4252a1930c51e85.tar.bz2 otp-ac82610a03c8b17b6bcae91aa4252a1930c51e85.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/test/diameter_ct.erl')
-rw-r--r-- | lib/diameter/test/diameter_ct.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/diameter/test/diameter_ct.erl b/lib/diameter/test/diameter_ct.erl index ed2f884681..85c502ea7f 100644 --- a/lib/diameter/test/diameter_ct.erl +++ b/lib/diameter/test/diameter_ct.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2013. All Rights Reserved. +%% Copyright Ericsson AB 2010-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -43,7 +43,7 @@ ct_run(Opts) -> info(Start , info()). info() -> - [{time, now()}, + [{time, diameter_lib:now()}, {process_count, erlang:system_info(process_count)} | erlang:memory()]. @@ -56,6 +56,6 @@ info(L0, L1) -> io:format("INFO: ~p~n", [Diff]). diff(time, T0, T1) -> - timer:now_diff(T1, T0); + diameter_lib:micro_diff(T1, T0); diff(_, N0, N1) -> N1 - N0. |