diff options
| author | Björn Gustavsson <[email protected]> | 2015-04-10 12:33:39 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-04-10 12:33:39 +0200 |
| commit | 5c2c2f537e66f1637eb51b364cb962a69a7b0faf (patch) | |
| tree | 07d651ad9cbe26e19f7f30086a9b1dcd805f487b /lib/stdlib/test/timer_simple_SUITE.erl | |
| parent | f54392bc3c811d44cef2b31c20cac9fb11bf38e1 (diff) | |
| parent | 45560fa257526745e07115f244c80912061ecc87 (diff) | |
| download | otp-5c2c2f537e66f1637eb51b364cb962a69a7b0faf.tar.gz otp-5c2c2f537e66f1637eb51b364cb962a69a7b0faf.tar.bz2 otp-5c2c2f537e66f1637eb51b364cb962a69a7b0faf.zip | |
Merge branch 'bjorn/stdlib/cuddle-with-tests'
* bjorn/stdlib/cuddle-with-tests:
Eliminate deprecated now/0 used as timestamp
Eliminate use of now/0 for creating a unique filename
Eliminate use of deprecated now/0 for measuring time
Eliminate use of deprecated now/0 for random number generation
Speed up timer_simple_SUITE:timer_perf/1
Speed up timer_SUITE
Optimize gen_server_SUITE:hibernate/1
Optimize gen_event_SUITE:hibernate/1
Optimize gen_fsm_SUITE:hibernate/1
Optimize unicode_SUITE:ex_binaries_errors* test cases
Optimize unicode_SUITE:binaries_errors/1
binary_module_SUITE: Remove unnecessary calls to the binref module
Optimize binary_module:random_ref_comp/1
Optimize io_proto_SUITE:unicode_options_gen/1
Diffstat (limited to 'lib/stdlib/test/timer_simple_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/timer_simple_SUITE.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/stdlib/test/timer_simple_SUITE.erl b/lib/stdlib/test/timer_simple_SUITE.erl index dc751aad16..3c7e3c5f25 100644 --- a/lib/stdlib/test/timer_simple_SUITE.erl +++ b/lib/stdlib/test/timer_simple_SUITE.erl @@ -374,7 +374,6 @@ performance(Mod) -> big_test(M) -> Load_Pids = start_nrev(20, M), % Increase if more load wanted :) - apply(M, sleep, [9000]), LPids = spawn_timers(5, M, 10000, 5), apply(M, sleep, [4000]), @@ -483,8 +482,7 @@ append([],X) -> X. system_time() -> - {M,S,U} = erlang:now(), - 1000000*(M*1000000 + S) + U. + erlang:monotonic_time(micro_seconds). %% ------------------------------------------------------- %% |