diff options
| author | Björn Gustavsson <[email protected]> | 2015-06-05 10:19:23 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-06-05 10:19:23 +0200 |
| commit | 24a161d8c479e70ad55ebac18cd92ecc41dd607c (patch) | |
| tree | a8a820696df69100100d11e282cdde291303bc9a /lib/kernel/test/interactive_shell_SUITE.erl | |
| parent | ccb7207b8ee271048905ef9b11448f98c645d533 (diff) | |
| parent | 34e019dc29044e6f3b8d256a20f4ca83a3ac24a7 (diff) | |
| download | otp-24a161d8c479e70ad55ebac18cd92ecc41dd607c.tar.gz otp-24a161d8c479e70ad55ebac18cd92ecc41dd607c.tar.bz2 otp-24a161d8c479e70ad55ebac18cd92ecc41dd607c.zip | |
Merge branch 'bjorn/kernel/cuddle-with-tests'
* bjorn/kernel/cuddle-with-tests:
Clean up rpc_SUITE:call_benchmark/1
Eliminate use of erlang:now/0 for generating random numbers
Eliminate use of erlang:now/0 for measuring time
Eliminate use of erlang:now/0 for generating unique node names
Diffstat (limited to 'lib/kernel/test/interactive_shell_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/interactive_shell_SUITE.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl index 3fb7c68886..89c574b025 100644 --- a/lib/kernel/test/interactive_shell_SUITE.erl +++ b/lib/kernel/test/interactive_shell_SUITE.erl @@ -718,8 +718,7 @@ toerl_loop(Port,Acc) -> end. millistamp() -> - {Mega, Secs, Micros} = erlang:now(), - (Micros div 1000) + Secs * 1000 + Mega * 1000000000. + erlang:monotonic_time(milli_seconds). get_data_within(Port, X, Acc) when X =< 0 -> ?dbg({get_data_within, X, Acc, ?LINE}), |