diff options
| author | Sverker Eriksson <sverker@erlang.org> | 2014-03-31 16:34:41 +0200 |
|---|---|---|
| committer | Sverker Eriksson <sverker@erlang.org> | 2014-03-31 16:34:41 +0200 |
| commit | aceb0f52a741cb805edcb6bcccc5d9ad6a84c5ff (patch) | |
| tree | 22a21852805a2a5d426a80c09c4d20d99a64a719 | |
| parent | 219785005b451dec785179a9e6d5ee2e7551f2b1 (diff) | |
| parent | 93d5acafec2c65a2a2b511e27cb4e05186811e82 (diff) | |
| download | erlang-aceb0f52a741cb805edcb6bcccc5d9ad6a84c5ff.tar.gz | |
Merge branch 'sverk/test-cuddle'
* sverk/test-cuddle:
erts: Fix bug in test case port_SUITE:otp_5119
erts: Reduce runtime of test port_SUITE:close_deaf_port
| -rw-r--r-- | erts/emulator/test/port_SUITE.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl index 202a8b7537..e01b2f253b 100644 --- a/erts/emulator/test/port_SUITE.erl +++ b/erts/emulator/test/port_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2013. All Rights Reserved. +%% Copyright Ericsson AB 1997-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -1698,12 +1698,13 @@ otp_5119(Config) when is_list(Config) -> Path = ?config(data_dir, Config), ok = load_driver(Path, "exit_drv"), PI1 = port_ix(otp_5119_fill_empty_port_tab([])), - PI2 = port_ix(erlang:open_port({spawn, "exit_drv"}, [])), + Port2 = erlang:open_port({spawn, "exit_drv"}, []), + PI2 = port_ix(Port2), {PortIx1, PortIx2} = case PI2 > PI1 of true -> {PI1, PI2}; false -> - {port_ix(otp_5119_fill_empty_port_tab([PI2])), + {port_ix(otp_5119_fill_empty_port_tab([Port2])), port_ix(erlang:open_port({spawn, "exit_drv"}, []))} end, MaxPorts = max_ports(), @@ -2318,7 +2319,7 @@ close_deaf_port(Config) when is_list(Config) -> test_server:timetrap_cancel(Dog), Res. -close_deaf_port_1(1000, _) -> +close_deaf_port_1(200, _) -> ok; close_deaf_port_1(N, Cmd) -> Timeout = integer_to_list(random:uniform(5*1000)), |