diff options
| author | Lukas Larsson <[email protected]> | 2017-09-11 15:15:57 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-09-11 15:15:57 +0200 |
| commit | 3b916092c488ef9d1fe93ab9c0afda88d589d97e (patch) | |
| tree | 07ef98d2993f4c7da9df355371628528248584f5 /erts/emulator/test | |
| parent | c15bb1698267ae64aac08b3b48040c44174700e5 (diff) | |
| parent | 69721d73cb00e31e6b27ccdd363991cb1965b869 (diff) | |
| download | otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.tar.gz otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.tar.bz2 otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.zip | |
Merge branch 'lukas/erts/non-smp-removal-cleanup/OTP-14518'
* lukas/erts/non-smp-removal-cleanup/OTP-14518:
Make estone work with older releases
erts: Allow read in ttsl driver to return EAGAIN
syntax_tools: Fix makefile dep
erts: non-smp removal cleanup in erlexec
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/estone_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/estone_SUITE.erl b/erts/emulator/test/estone_SUITE.erl index c4899967ca..c9c1867049 100644 --- a/erts/emulator/test/estone_SUITE.erl +++ b/erts/emulator/test/estone_SUITE.erl @@ -379,7 +379,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). |