File 0686-ssl-Correct-tests.patch of Package erlang
From d8ea8266e016663ae929525e8f29c2f711b2bd50 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 20 Jan 2021 15:23:53 +0100
Subject: [PATCH] ssl: Correct tests
---
lib/ssl/test/ssl_dist_SUITE.erl | 2 +-
lib/ssl/test/ssl_dist_test_lib.erl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 019e22eaa8..59e187aeae 100644
--- a/lib/ssl/test/ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -82,7 +82,7 @@ init_per_testcase(plain_verify_options = Case, Config) when is_list(Config) ->
os:putenv("ERL_FLAGS", SslFlags),
"";
OldFlags ->
- os:putenv("ERL_FLAGS", OldFlags ++ "" ++ SslFlags),
+ os:putenv("ERL_FLAGS", OldFlags ++ " " ++ SslFlags),
OldFlags
end,
common_init(Case, [{old_flags, Flags} | Config]);
@@ -711,7 +711,7 @@ start_ssl_node_raw(Name, Args) ->
case open_port({spawn, CmdLine}, []) of
Port when is_port(Port) ->
unlink(Port),
- erlang:port_close(Port),
+ catch erlang:port_close(Port),
case await_ssl_node_up(Name, LSock) of
#node_handle{} = NodeHandle ->
?t:format("Ssl node ~s started.~n", [Name]),
--
2.26.2