diff options
| author | Lukas Larsson <[email protected]> | 2011-09-29 17:54:27 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-09-29 17:54:27 +0200 |
| commit | 71099221fc8d0456fb38b1954e9053ec527d43b2 (patch) | |
| tree | 6e0b29ded24837b7e31c1ddcd0df5608c1af199e /erts/emulator/test/busy_port_SUITE.erl | |
| parent | fbf611254ded96a0bbeedb76b895f39958b04edc (diff) | |
| parent | 1be1c1cb15068aed40a30210c8be34f36e38ed66 (diff) | |
| download | otp-71099221fc8d0456fb38b1954e9053ec527d43b2.tar.gz otp-71099221fc8d0456fb38b1954e9053ec527d43b2.tar.bz2 otp-71099221fc8d0456fb38b1954e9053ec527d43b2.zip | |
Merge branch 'dev' into major
* dev:
Skip create_big_boot on platforms without crypto
Remove test_server path instead of cwd for clash test
Skip getaddr_v6 test if on the ipv4_only host
Use static port for old solaris versions
Extend time to wait for zone files to be loaded
Allow out of memory exception for max_port checks
Extend slave start timeout for windows tests
Double timeout to make sure debug builds pass
Use now instead of os:timestamp
Increase timeout in scheduler_suspend for slow platforms
Skip update_cpu_info if 'taskset' cannot be found
Diffstat (limited to 'erts/emulator/test/busy_port_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/busy_port_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl index dac2a70f59..3a29fd4d68 100644 --- a/erts/emulator/test/busy_port_SUITE.erl +++ b/erts/emulator/test/busy_port_SUITE.erl @@ -509,12 +509,12 @@ hs_busy_pcmd(Prt, Opts, StartFun, EndFun) -> P = spawn_link(fun () -> erlang:yield(), Tester ! {self(), doing_port_command}, - Start = os:timestamp(), + Start = now(), Res = try {return, port_command(Prt, [], Opts)} catch Exception:Error -> {Exception, Error} end, - End = os:timestamp(), + End = now(), Time = round(timer:now_diff(End, Start)/1000), Tester ! {self(), port_command_result, Res, Time} end), |