diff options
| author | Raimo Niskanen <[email protected]> | 2016-05-31 18:26:26 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-06-01 08:15:59 +0200 |
| commit | 624fb38a6949fff28a7be80527ce126a26e2ad18 (patch) | |
| tree | 84a907a18937f0014d194a0a748229b3bfd8e4ad /lib/ssl | |
| parent | 79cf49a82bd1e654f05b3be092ee11686ac2828c (diff) | |
| download | otp-624fb38a6949fff28a7be80527ce126a26e2ad18.tar.gz otp-624fb38a6949fff28a7be80527ce126a26e2ad18.tar.bz2 otp-624fb38a6949fff28a7be80527ce126a26e2ad18.zip | |
Quote curly brackets in command line options
Some shells i.e the bash emulating sh regard curly brackets
as special characters so e.g {a,b,{}} is expanded to a b {} which
is by erlang regarded as 3 arguments instead of a 3-tuple.
Other shells e.g Bourne classic /bin/sh, the ash/dash variants
and public domain Korn shell all avoid this surprise.
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_dist_SUITE.erl | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl index 6aacc8ecf4..16193e6327 100644 --- a/lib/ssl/test/ssl_dist_SUITE.erl +++ b/lib/ssl/test/ssl_dist_SUITE.erl @@ -426,8 +426,10 @@ verify_fun_fail() -> [{doc,"Test specifying verify_fun with a function that always fails"}]. verify_fun_fail(Config) when is_list(Config) -> DistOpts = "-ssl_dist_opt " - "server_verify verify_peer server_verify_fun {ssl_dist_SUITE,verify_fail_always,{}} " - "client_verify verify_peer client_verify_fun {ssl_dist_SUITE,verify_fail_always,{}} ", + "server_verify verify_peer server_verify_fun " + "\"{ssl_dist_SUITE,verify_fail_always,{}}\" " + "client_verify verify_peer client_verify_fun " + "\"{ssl_dist_SUITE,verify_fail_always,{}}\" ", NH1 = start_ssl_node([{additional_dist_opts, DistOpts} | Config]), NH2 = start_ssl_node([{additional_dist_opts, DistOpts} | Config]), @@ -469,9 +471,11 @@ verify_fun_pass() -> [{doc,"Test specifying verify_fun with a function that always succeeds"}]. verify_fun_pass(Config) when is_list(Config) -> DistOpts = "-ssl_dist_opt " - "server_verify verify_peer server_verify_fun {ssl_dist_SUITE,verify_pass_always,{}} " + "server_verify verify_peer server_verify_fun " + "\"{ssl_dist_SUITE,verify_pass_always,{}}\" " "server_fail_if_no_peer_cert true " - "client_verify verify_peer client_verify_fun {ssl_dist_SUITE,verify_pass_always,{}} ", + "client_verify verify_peer client_verify_fun " + "\"{ssl_dist_SUITE,verify_pass_always,{}}\" ", NH1 = start_ssl_node([{additional_dist_opts, DistOpts} | Config]), Node1 = NH1#node_handle.nodename, @@ -597,7 +601,8 @@ crl_cache_check_pass(Config) when is_list(Config) -> NodeDir = filename:join([PrivDir, "Certs"]), DistOpts = "-ssl_dist_opt " "client_crl_check true " - "client_crl_cache {ssl_dist_SUITE,{\\\"" ++ NodeDir ++ "\\\",[]}}", + "client_crl_cache " + "\"{ssl_dist_SUITE,{\\\"" ++ NodeDir ++ "\\\",[]}}\"", NewConfig = [{many_verify_opts, true}, {additional_dist_opts, DistOpts}] ++ Config, @@ -623,7 +628,8 @@ crl_cache_check_fail(Config) when is_list(Config) -> NodeDir = filename:join([PrivDir, "Certs"]), DistOpts = "-ssl_dist_opt " "client_crl_check true " - "client_crl_cache {ssl_dist_SUITE,{\\\"" ++ NodeDir ++ "\\\",[]}}", + "client_crl_cache " + "\"{ssl_dist_SUITE,{\\\"" ++ NodeDir ++ "\\\",[]}}\"", NewConfig = [{many_verify_opts, true}, %% The server uses a revoked certificate. |