aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-08-21 14:57:03 +0200
committerLukas Larsson <[email protected]>2017-09-11 15:15:33 +0200
commit69721d73cb00e31e6b27ccdd363991cb1965b869 (patch)
tree8623017481519b646319d70dddf3e225ac5a193b /erts
parent7f8e78dee2ff485de7eddce1bfab28d0823031ae (diff)
downloadotp-69721d73cb00e31e6b27ccdd363991cb1965b869.tar.gz
otp-69721d73cb00e31e6b27ccdd363991cb1965b869.tar.bz2
otp-69721d73cb00e31e6b27ccdd363991cb1965b869.zip
Make estone work with older releases
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/estone_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/estone_SUITE.erl b/erts/emulator/test/estone_SUITE.erl
index 8b336b366d..01eb1852f6 100644
--- a/erts/emulator/test/estone_SUITE.erl
+++ b/erts/emulator/test/estone_SUITE.erl
@@ -364,7 +364,7 @@ monotonic_time() ->
try erlang:monotonic_time() catch error:undef -> erlang:now() end.
subtr(Before, After) when is_integer(Before), is_integer(After) ->
- erlang:convert_time_unit(After-Before, native, microsecond);
+ erlang:convert_time_unit(After-Before, native, 1000000);
subtr({_,_,_}=Before, {_,_,_}=After) ->
timer:now_diff(After, Before).