diff options
author | Björn Gustavsson <[email protected]> | 2017-11-20 10:11:14 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2017-11-20 10:11:14 +0100 |
commit | 7118c06ee07296337d4348289abc686617e577e9 (patch) | |
tree | 7743923a45f72f35bece6de3611d617a749d42cf /erts/emulator | |
parent | 7de66cbf895db8650e2b3253d910869c67989b35 (diff) | |
parent | 1107083935fbdb8f8a7ece9549d8203652c4fec6 (diff) | |
download | otp-7118c06ee07296337d4348289abc686617e577e9.tar.gz otp-7118c06ee07296337d4348289abc686617e577e9.tar.bz2 otp-7118c06ee07296337d4348289abc686617e577e9.zip |
Merge branch 'bjorn/make_port/OTP-14704'
* bjorn/make_port/OTP-14704:
Avoid using the efile driver in test suites
Diffstat (limited to 'erts/emulator')
-rw-r--r-- | erts/emulator/test/binary_SUITE.erl | 2 | ||||
-rw-r--r-- | erts/emulator/test/distribution_SUITE.erl | 5 | ||||
-rw-r--r-- | erts/emulator/test/guard_SUITE.erl | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl index b59c22f125..c71267a6d1 100644 --- a/erts/emulator/test/binary_SUITE.erl +++ b/erts/emulator/test/binary_SUITE.erl @@ -1202,7 +1202,7 @@ very_big_num(0, Result) -> Result. make_port() -> - open_port({spawn, efile}, [eof]). + hd(erlang:ports()). make_pid() -> spawn_link(?MODULE, sleeper, []). diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl index f1831b7c45..e40d346e10 100644 --- a/erts/emulator/test/distribution_SUITE.erl +++ b/erts/emulator/test/distribution_SUITE.erl @@ -742,7 +742,7 @@ link_to_dead_new_node(Config) when is_list(Config) -> %% doesn't correct them in any way. ref_port_roundtrip(Config) when is_list(Config) -> process_flag(trap_exit, true), - Port = open_port({spawn, efile}, []), + Port = make_port(), Ref = make_ref(), {ok, Node} = start_node(ref_port_roundtrip), net_adm:ping(Node), @@ -763,6 +763,9 @@ ref_port_roundtrip(Config) when is_list(Config) -> end, ok. +make_port() -> + hd(erlang:ports()). + roundtrip(Term) -> exit(Term). diff --git a/erts/emulator/test/guard_SUITE.erl b/erts/emulator/test/guard_SUITE.erl index 1a93a9f5c2..f2c1595392 100644 --- a/erts/emulator/test/guard_SUITE.erl +++ b/erts/emulator/test/guard_SUITE.erl @@ -500,7 +500,7 @@ all_types() -> {atom, xxxx}, {ref, make_ref()}, {pid, self()}, - {port, open_port({spawn, efile}, [])}, + {port, make_port()}, {function, fun(_) -> "" end}, {function, fun erlang:abs/1}, {binary, list_to_binary([])}, @@ -551,4 +551,7 @@ type_test(bitstring, X) when is_bitstring(X) -> type_test(function, X) when is_function(X) -> function. +make_port() -> + hd(erlang:ports()). + id(I) -> I. |