diff options
| author | Rickard Green <[email protected]> | 2016-09-14 10:10:17 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-09-14 10:10:17 +0200 |
| commit | 19d6c4e7830ee8513a4b614cbb39862868fc57a1 (patch) | |
| tree | d35efc2defe57dac5ee78e69d8dc383ddc8c678c /erts/emulator/test/driver_SUITE.erl | |
| parent | 4ad2eb90dbaab253cdac83030655b9bf6e4bc53d (diff) | |
| parent | 596b238d2ab630d680484bd61eace06712e5908f (diff) | |
| download | otp-19d6c4e7830ee8513a4b614cbb39862868fc57a1.tar.gz otp-19d6c4e7830ee8513a4b614cbb39862868fc57a1.tar.bz2 otp-19d6c4e7830ee8513a4b614cbb39862868fc57a1.zip | |
Merge branch 'maint'
* maint:
Ensure long enough sleep in driver_SUITE:timer_delay driver
Diffstat (limited to 'erts/emulator/test/driver_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/driver_SUITE.erl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl index 1df72193a6..2fbf6eae61 100644 --- a/erts/emulator/test/driver_SUITE.erl +++ b/erts/emulator/test/driver_SUITE.erl @@ -452,11 +452,7 @@ timer_delay(Config) when is_list(Config) -> TimeBefore = erlang:monotonic_time(), Timeout0 = 350, erlang:port_command(Port, <<?DELAY_START_TIMER,Timeout0:32>>), - Timeout = Timeout0 + - case os:type() of - {win32,_} -> 0; %Driver doesn't sleep on Windows. - _ -> 1000 - end, + Timeout = Timeout0 + 1000, receive {Port,{data,[?TIMER]}} -> Elapsed = erl_millisecs() - erl_millisecs(TimeBefore), |