aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-11-14 10:37:36 +0100
committerIngela Anderton Andin <[email protected]>2018-11-14 10:37:36 +0100
commitcfd3c70fd5d8f522a547c8ef65bb904d3093744c (patch)
tree3677082dc4babb6e69278ae1c897ee4079bbddf8
parentb0c054fe7c8f6467f3309e47ec62cfc9300bcc14 (diff)
parentcd43e37022a5e799318f8ba81922103b6b3a2ad6 (diff)
downloadotp-cfd3c70fd5d8f522a547c8ef65bb904d3093744c.tar.gz
otp-cfd3c70fd5d8f522a547c8ef65bb904d3093744c.tar.bz2
otp-cfd3c70fd5d8f522a547c8ef65bb904d3093744c.zip
Merge branch 'ingela/ssl/maint-bench-cuddle' into maint
* ingela/ssl/maint-bench-cuddle: ssl: Handle unicode ~s -> ~ts
-rw-r--r--lib/ssl/test/ssl_bench_test_lib.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_bench_test_lib.erl b/lib/ssl/test/ssl_bench_test_lib.erl
index e5cbb911bd..47bcd41608 100644
--- a/lib/ssl/test/ssl_bench_test_lib.erl
+++ b/lib/ssl/test/ssl_bench_test_lib.erl
@@ -58,13 +58,13 @@ setup(Name) ->
Path = code:get_path(),
true = rpc:call(Node, code, set_path, [Path]),
ok = rpc:call(Node, ?MODULE, setup_server, [node()]),
- io:format("Client (~p) using ~s~n",[node(), code:which(ssl)]),
+ io:format("Client (~p) using ~ts~n",[node(), code:which(ssl)]),
(Node =:= node()) andalso restrict_schedulers(client),
Node.
setup_server(ClientNode) ->
(ClientNode =:= node()) andalso restrict_schedulers(server),
- io:format("Server (~p) using ~s~n",[node(), code:which(ssl)]),
+ io:format("Server (~p) using ~ts~n",[node(), code:which(ssl)]),
ok.
restrict_schedulers(Type) ->