File 1903-inets-Fix-socketwrap_SUITE-to-work-with-sp... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1903-inets-Fix-socketwrap_SUITE-to-work-with-space-in-pat.patch of Package erlang (Revision 54461a2357af3de1f765489d2fd0ee14)

Currently displaying revision 54461a2357af3de1f765489d2fd0ee14 , Show latest

From 1dd0b30ce927639809432e236f2328186b72191b Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 12 Apr 2022 12:43:01 +0200
Subject: [PATCH 3/9] inets: Fix socketwrap_SUITE to work with space in path

---
 lib/inets/test/inets_socketwrap_SUITE.erl | 32 +++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/inets/test/inets_socketwrap_SUITE.erl b/lib/inets/test/inets_socketwrap_SUITE.erl
index b88cff4e90..562f4ee7f1 100644
--- a/lib/inets/test/inets_socketwrap_SUITE.erl
+++ b/lib/inets/test/inets_socketwrap_SUITE.erl
@@ -73,12 +73,11 @@ start_httpd_fd(Config) when is_list(Config) ->
 	    InetPort = inets_test_lib:inet_port(node()),
 	    ct:log("Node: ~p  Port ~p~n", [Node, InetPort]),
       	    Wrapper = filename:join(DataDir, "setuid_socket_wrap"),
-	    Cmd = Wrapper ++  
-		" -s -httpd_80,0:" ++ integer_to_list(InetPort) 
-		++ " -p " ++ os:find_executable("erl") ++
-		" -- " ++ NodeArg, 
-	    ct:log("cmd: ~p~n", [Cmd]),
-	    case open_port({spawn, Cmd}, [stderr_to_stdout]) of 
+            Args = ["-s","-httpd_80,0:" ++ integer_to_list(InetPort),
+                    "-p",os:find_executable("erl"),"--" | NodeArg],
+	    ct:log("cmd: ~p ~p~n", [Wrapper, Args]),
+	    case open_port({spawn_executable, Wrapper},
+                           [stderr_to_stdout,{args,Args}]) of
 	    	Port when is_port(Port) ->
 		    wait_node_up(Node, 10),
 		    ct:log("~p", [rpc:call(Node, init, get_argument, [httpd_80])]),
@@ -97,19 +96,18 @@ start_httpd_fd(Config) when is_list(Config) ->
 setup_node_info(nonode@nohost) ->
     {skip, needs_distributed_node};
 setup_node_info(Node) ->
-    Static = "-detached -noinput",
     Name = "inets_fd_test",
     NameSw = case net_kernel:longnames() of
-		 false -> "-sname ";
-		 _ -> "-name "
-		     end,
-    StrNode = 
-	Static ++ " "
-	++ NameSw ++ " " ++ Name ++ " "
-	++ "-setcookie " ++ atom_to_list(erlang:get_cookie()),
-	    [_, Location] = string:tokens(atom_to_list(Node), "$@"),
-    TestNode =  Name ++ "@" ++ Location, 
-    {list_to_atom(TestNode), StrNode}.
+		 false -> "-sname";
+		 _ -> "-name"
+             end,
+    NodeArgs = ["-detached","-noinput",
+                NameSw, Name, "-setcookie", atom_to_list(erlang:get_cookie())],
+
+    [_, Location] = string:tokens(atom_to_list(Node), "$@"),
+    TestNode =  Name ++ "@" ++ Location,
+
+    {list_to_atom(TestNode), NodeArgs}.
 
 wait_node_up(Node, 0) ->
     ct:fail({failed_to_start_node, Node});
-- 
2.35.3

Places

File 1903-inets-Fix-socketwrap_SUITE-to-work-with-space-in-pat.patch of Package erlang (Revision 54461a2357af3de1f765489d2fd0ee14)

Places