diff options
| author | Lukas Larsson <[email protected]> | 2016-05-31 14:36:40 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-06-14 10:09:38 +0200 |
| commit | f18d6eb9d6900e21cefe3ce44b644015a0444279 (patch) | |
| tree | c0780566426aaea3c898622975afd7cc3d388e63 /erts/emulator | |
| parent | d837c512bff62d5ad932cda615a340ad088a8999 (diff) | |
| download | otp-f18d6eb9d6900e21cefe3ce44b644015a0444279.tar.gz otp-f18d6eb9d6900e21cefe3ce44b644015a0444279.tar.bz2 otp-f18d6eb9d6900e21cefe3ce44b644015a0444279.zip | |
erts: Fix distribution_SUITE:bulk_send_bigbig on windows
The granualarity of the windows time sometimes makes timer:tc
return 0 as the time taken for the test. Change this to use
the most common time instead.
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/test/distribution_SUITE.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl index 258ae57e18..0b5fdbd7ff 100644 --- a/erts/emulator/test/distribution_SUITE.erl +++ b/erts/emulator/test/distribution_SUITE.erl @@ -182,8 +182,13 @@ bulk_sendsend2(Terms, BinSize, BusyBufSize) -> {ok, NodeSend} = start_node(bulk_sender, "+zdbbl " ++ integer_to_list(BusyBufSize)), _Send = spawn(NodeSend, erlang, apply, [fun sendersender/4, [self(), Recv, Bin, Terms]]), {Elapsed, {_TermsN, SizeN}, MonitorCount} = - receive {sendersender, BigRes} -> - BigRes + receive + %% On some platforms (windows), the time taken is 0 so we + %% simulate that some little time has passed. + {sendersender, {0.0,T,MC}} -> + {0.0015, T, MC}; + {sendersender, BigRes} -> + BigRes end, stop_node(NodeRecv), stop_node(NodeSend), |