aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-08-31 09:53:38 +0200
committerLukas Larsson <[email protected]>2017-08-31 09:53:38 +0200
commit81542a84139d63e855823a4f8f9af9a31852923b (patch)
tree300067845dd3e03e0f99be1ce52bef15afe3634b /erts/emulator
parentea46749ffc0d12ff6b4e37964c26123f1af4b8ec (diff)
parentcd5217099530419e8d53a1f96d9e477ac6620417 (diff)
downloadotp-81542a84139d63e855823a4f8f9af9a31852923b.tar.gz
otp-81542a84139d63e855823a4f8f9af9a31852923b.tar.bz2
otp-81542a84139d63e855823a4f8f9af9a31852923b.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/port_SUITE.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index ab0b1a82bd..730a17d7e8 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -159,7 +159,7 @@ suite() ->
all() ->
[otp_6224, {group, stream}, basic_ping, slow_writes,
bad_packet, bad_port_messages, {group, options},
- {group, multiple_packets}, parallell, dying_port,
+ {group, multiple_packets}, parallell, dying_port, dropped_commands,
port_program_with_path, open_input_file_port,
open_output_file_port, name1, env, huge_env, bad_env, cd,
cd_relative, pipe_limit_env, bad_args,
@@ -569,12 +569,14 @@ dropped_commands(Config, Outputv, Cmd) ->
[dropped_commands_test(Cmd) || _ <- lists:seq(1, 100)],
timer:sleep(100),
erl_ddll:unload_driver("echo_drv"),
+ os:unsetenv("ECHO_DRV_USE_OUTPUTV"),
ok.
dropped_commands_test(Cmd) ->
- Port = erlang:open_port({spawn_driver, "echo_drv"}, [{parallelism, true}]),
spawn_monitor(
fun() ->
+ Port = erlang:open_port({spawn_driver, "echo_drv"},
+ [{parallelism, true}]),
[spawn_link(fun() -> spin(Port, Cmd) end) || _ <- lists:seq(1,8)],
timer:sleep(5),
port_close(Port),