Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Ledest:erlang:24
erlang
4457-Add-correct-path-argument-to-node-b-s-comm...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 4457-Add-correct-path-argument-to-node-b-s-command-line.patch of Package erlang
From d3be23224bba57458559a194c6a0cb648a455526 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen <raimo@erlang.org> Date: Fri, 30 Sep 2022 14:50:28 +0200 Subject: [PATCH 07/27] Add correct path argument to node b's command line --- lib/ssl/test/ssl_bench_test_lib.erl | 12 +++++++----- lib/ssl/test/ssl_dist_SUITE.erl | 3 ++- lib/ssl/test/ssl_dist_bench_SUITE.erl | 8 ++++++-- lib/ssl/test/ssl_dist_test_lib.erl | 4 +--- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/lib/ssl/test/ssl_bench_test_lib.erl b/lib/ssl/test/ssl_bench_test_lib.erl index 7e40ce721f..648b42fb03 100644 --- a/lib/ssl/test/ssl_bench_test_lib.erl +++ b/lib/ssl/test/ssl_bench_test_lib.erl @@ -43,11 +43,10 @@ setup(Name) -> pong -> Node; pang -> - Pa = filename:dirname(code:which(?MODULE)), PeerOptions = #{name => NameStr, - host => Host, - args => ["-pa", Pa]}, + host => Host}, + ct:pal("PeerOptions: ~p~n", [PeerOptions]), {ok, _Pid, Node} = peer:start( case Remote of @@ -125,6 +124,9 @@ cleanup(Node) -> try erpc:call(Node, erlang, halt, [], 5000) of Result -> ct:fail({unexpected_return, Result}) - catch error : {erpc,noconnection} -> - ok + catch + error : {erpc,noconnection} -> + ok; + Class : Reason : Stacktrace -> + ct:fail({unexpected_exception, {Class,Reason,Stacktrace}}) end. diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl index c74e00773a..f7b3264d37 100644 --- a/lib/ssl/test/ssl_dist_SUITE.erl +++ b/lib/ssl/test/ssl_dist_SUITE.erl @@ -98,7 +98,8 @@ stop_ssl_node/1]). start_ssl_node_name(Name, Args) -> - ssl_dist_test_lib:start_ssl_node(Name, Args). + Pa = filename:dirname(code:which(?MODULE)), + ssl_dist_test_lib:start_ssl_node(Name, "-pa " ++ Pa ++ " " ++ Args). %%-------------------------------------------------------------------- %% Common Test interface functions ----------------------------------- diff --git a/lib/ssl/test/ssl_dist_bench_SUITE.erl b/lib/ssl/test/ssl_dist_bench_SUITE.erl index 164ccfd99b..f8f53e4e65 100644 --- a/lib/ssl/test/ssl_dist_bench_SUITE.erl +++ b/lib/ssl/test/ssl_dist_bench_SUITE.erl @@ -867,14 +867,18 @@ ssl_apply(Handle, Fun) -> start_ssl_node_a(Config) -> Name = proplists:get_value(node_a_name, Config), Args = get_node_args(node_a_dist_args, Config), - ssl_dist_test_lib:start_ssl_node(Name, Args). + Pa = filename:dirname(code:which(?MODULE)), + ssl_dist_test_lib:start_ssl_node( + Name, "-pa " ++ Pa ++ " " ++ Args). start_ssl_node_b(Config) -> Name = proplists:get_value(node_b_name, Config), Args = get_node_args(node_b_dist_args, Config), + Pa = filename:dirname(code:which(?MODULE)), ServerNode = proplists:get_value(server_node, Config), rpc:call( - ServerNode, ssl_dist_test_lib, start_ssl_node, [Name, Args]). + ServerNode, ssl_dist_test_lib, start_ssl_node, + [Name, "-pa " ++ Pa ++ " " ++ Args]). stop_ssl_node_a(HA) -> ssl_dist_test_lib:stop_ssl_node(HA). diff --git a/lib/ssl/test/ssl_dist_test_lib.erl b/lib/ssl/test/ssl_dist_test_lib.erl index 45da600767..90aae473e2 100644 --- a/lib/ssl/test/ssl_dist_test_lib.erl +++ b/lib/ssl/test/ssl_dist_test_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2017-2021. All Rights Reserved. +%% Copyright Ericsson AB 2017-2022. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -136,7 +136,6 @@ host_name() -> mk_node_cmdline(ListenPort, Name, Args, LogPath, DumpPath) -> Static = "-detached -noinput", - Pa = filename:dirname(code:which(?MODULE)), Prog = case catch init:get_argument(progname) of {ok,[[P]]} -> P; _ -> exit(no_progname_argument_found) @@ -148,7 +147,6 @@ mk_node_cmdline(ListenPort, Name, Args, LogPath, DumpPath) -> "\"" ++ Prog ++ "\" " ++ Static ++ " " ++ NameSw ++ " " ++ Name ++ " " - ++ "-pa " ++ Pa ++ " " ++ "-run application start crypto -run application start public_key " ++ "-eval 'net_kernel:verbose(1)' " ++ "-run " ++ atom_to_list(?MODULE) ++ " cnct2tstsrvr " -- 2.35.3
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor