File 0895-kernel-Fix-erl_dist-SUITE-nodenames-tc.patch of Package erlang
From 16225f77e4c8c793461006823ab56b4a1ad50978 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 2 Jun 2020 15:55:33 +0200
Subject: [PATCH 11/18] kernel: Fix erl_dist SUITE nodenames tc
When giving multiple -sname it is the first one that counts.
---
lib/kernel/test/erl_distribution_SUITE.erl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index cf5b2d537d..c57b87ca98 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -216,7 +216,7 @@ nodenames(Config) when is_list(Config) ->
legal("a_1@b"),
%% Test that giving two -sname works as it should
- test_node("a_1@b", false, long_or_short() ++ "a_0@b"),
+ started = test_node("a_1@b", false, long_or_short() ++ "a_0@b"),
illegal("cdé@a"),
illegal("te欢st@a").
@@ -274,8 +274,8 @@ test_node(Name, Illigal) ->
test_node(Name, Illigal, "").
test_node(Name, Illigal, ExtraArgs) ->
ProgName = ct:get_progname(),
- Command = ProgName ++ " -noinput " ++ ExtraArgs ++
- long_or_short() ++ Name ++
+ Command = ProgName ++ " -noinput " ++
+ long_or_short() ++ Name ++ ExtraArgs ++
" -eval \"net_adm:ping('" ++ atom_to_list(node()) ++ "')\"" ++
case Illigal of
true ->
--
2.26.2