aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/port_SUITE.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-09-29 17:53:50 +0200
committerLukas Larsson <[email protected]>2011-09-29 17:53:50 +0200
commit1be1c1cb15068aed40a30210c8be34f36e38ed66 (patch)
tree4abf3248faaa95f9c0fd6098ebab42074f196fd5 /erts/emulator/test/port_SUITE.erl
parent0911888f960502e4ee789e82141090c31a2a83a8 (diff)
parentd41617d9969253d9e66270beebac843865036baa (diff)
downloadotp-1be1c1cb15068aed40a30210c8be34f36e38ed66.tar.gz
otp-1be1c1cb15068aed40a30210c8be34f36e38ed66.tar.bz2
otp-1be1c1cb15068aed40a30210c8be34f36e38ed66.zip
Merge branch 'lukas/fix_erts_testcases/OTP-9596' into dev
* lukas/fix_erts_testcases/OTP-9596: 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/port_SUITE.erl')
-rw-r--r--erts/emulator/test/port_SUITE.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index eac56a867d..0a1ef5a78f 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -724,6 +724,8 @@ open_ports(Name, Settings) ->
[];
system_limit ->
[];
+ enomem ->
+ [];
Other ->
?line test_server:fail({open_ports, Other})
end;