From 3d44429177a7dbdac5662433cfc55f5b5113a959 Mon Sep 17 00:00:00 2001
From: Richard Carlsson <richardc@klarna.com>
Date: Tue, 17 Apr 2018 14:11:34 +0200
Subject: Add ct:get_progname/0

This replaces all uses of lib:progname/0 in tests.
---
 erts/emulator/test/distribution_SUITE.erl | 6 +++---
 erts/emulator/test/port_SUITE.erl         | 8 ++++----
 erts/emulator/test/sensitive_SUITE.erl    | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'erts/emulator/test')

diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index e40d346e10..0e383ee879 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -797,7 +797,7 @@ show_term(Term) ->
 
 %% Tests behaviour after net_kernel:stop (OTP-2586).
 stop_dist(Config) when is_list(Config) ->
-    Str = os:cmd(atom_to_list(lib:progname())
+    Str = os:cmd(ct:get_progname()
                  ++ " -noshell -pa "
                  ++ proplists:get_value(data_dir, Config)
                  ++ " -s run"),
@@ -974,9 +974,9 @@ dist_auto_connect_start(Name, Value) when is_list(Name), is_atom(Value) ->
     ModuleDir = filename:dirname(code:which(?MODULE)),
     ValueStr = atom_to_list(Value),
     Cookie = atom_to_list(erlang:get_cookie()),
-    Cmd = lists:concat(
+    Cmd = lists:append(
             [%"xterm -e ",
-             atom_to_list(lib:progname()),
+             ct:get_progname(),
              %	     " -noinput ",
              " -detached ",
              long_or_short(), " ", Name,
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 5b39d05df8..eb9b94a316 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -965,7 +965,7 @@ env_slave(File, Env) ->
 
 env_slave(File, Env, Body) ->
     file:write_file(File, term_to_binary(Body)),
-    Program = atom_to_list(lib:progname()),
+    Program = ct:get_progname(),
     Dir = filename:dirname(code:which(?MODULE)),
     Cmd = Program ++ " -pz " ++ Dir ++
     " -noinput -run " ++ ?MODULE_STRING ++ " env_slave_main " ++
@@ -1129,7 +1129,7 @@ try_bad_args(Args) ->
 cd(Config)  when is_list(Config) ->
     ct:timetrap({minutes, 1}),
 
-    Program = atom_to_list(lib:progname()),
+    Program = ct:get_progname(),
     DataDir = proplists:get_value(data_dir, Config),
     TestDir = filename:join(DataDir, "dir"),
     Cmd = Program ++ " -pz " ++ DataDir ++
@@ -1191,7 +1191,7 @@ cd(Config)  when is_list(Config) ->
 %% be relative the new cwd and not the original
 cd_relative(Config) ->
 
-    Program = atom_to_list(lib:progname()),
+    Program = ct:get_progname(),
     DataDir = proplists:get_value(data_dir, Config),
     TestDir = filename:join(DataDir, "dir"),
 
@@ -1214,7 +1214,7 @@ cd_relative(Config) ->
 
 relative_cd() ->
 
-    Program = atom_to_list(lib:progname()),
+    Program = ct:get_progname(),
     ok = file:set_cwd(".."),
     {ok, Cwd} = file:get_cwd(),
 
diff --git a/erts/emulator/test/sensitive_SUITE.erl b/erts/emulator/test/sensitive_SUITE.erl
index c3e303bbd1..9b23a30e88 100644
--- a/erts/emulator/test/sensitive_SUITE.erl
+++ b/erts/emulator/test/sensitive_SUITE.erl
@@ -413,7 +413,7 @@ my_process_info(Pid, Tag) ->
 
 t_process_display(Config) when is_list(Config) ->
     Dir = filename:dirname(code:which(?MODULE)),
-    Cmd = atom_to_list(lib:progname()) ++ " -noinput -pa " ++ Dir ++
+    Cmd = ct:get_progname() ++ " -noinput -pa " ++ Dir ++
     " -run " ++ ?MODULE_STRING ++ " remote_process_display",
     io:put_chars(Cmd),
     P = open_port({spawn,Cmd}, [in,stderr_to_stdout,eof]),
-- 
cgit v1.2.3