Merge branch 'richcarl/eliminate_lib_module/PR-1786/OTP-15072'

* richcarl/eliminate_lib_module/PR-1786/OTP-15072:
  Fix minor issues
  Eliminate call to ct:get_progname() in ts_erl_config
  Use \n escape instead of integer 10
  Move error formatting to erl_error.erl and delete lib.erl
  Move extended parse functions in lib.erl to erl_eval.erl
  Move lib:eval_str/1 into mod_esi.erl
  Remove lib:progname/0
  Eliminate call to lib:progname/1 in slave.erl
  Add ct:get_progname/0
  Remove lib:error_message/2
  Remove lib:flush_receive/0
  Remove lib:send/2 and lib:sendw/2
  Move lib:nonl/1 into yecc.erl

3 files changed, 20 insertions, 7 deletions

diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index fd7fa07b81..14a9ec07cf 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -87,6 +87,7 @@
 	 decrypt_config_file/2, decrypt_config_file/3]).
 
 -export([get_target_name/1]).
+-export([get_progname/0]).
 -export([parse_table/1, listenv/1]).
 
 -export([remaining_test_procs/0]).
@@ -975,7 +976,20 @@ make_priv_dir() ->
 %%% belongs to.
 get_target_name(Handle) ->
     ct_util:get_target_name(Handle).
-    
+
+%%%-----------------------------------------------------------------
+%%% @doc Return the command used to start (this) erlang
+
+-spec get_progname() -> string().
+
+get_progname() ->
+    case init:get_argument(progname) of
+	{ok, [[Prog]]} ->
+	    Prog;
+	_Other ->
+	    "no_prog_name"
+    end.
+
 %%%-----------------------------------------------------------------
 %%% @spec parse_table(Data) -> {Heading,Table}
 %%%       Data = [string()]
@@ -1006,7 +1020,6 @@ parse_table(Data) ->
 listenv(Telnet) ->
     ct_util:listenv(Telnet).
 
-
 %%%-----------------------------------------------------------------
 %%% @spec testcases(TestDir, Suite) -> Testcases | {error,Reason}
 %%%       TestDir = string()
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index 1ae6c8c7c7..67645cac08 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -4382,7 +4382,7 @@ do_format_exception(Reason={Error,Stack}) ->
     PF = fun(Term, I) ->
 		 io_lib:format("~." ++ integer_to_list(I) ++ "tp", [Term])
 	 end,
-    case catch lib:format_exception(1, error, Error, Stack, StackFun, PF, utf8) of
+    case catch erl_error:format_exception(1, error, Error, Stack, StackFun, PF, utf8) of
 	{'EXIT',_R} ->
 	    {"~tp",Reason};
 	Formatted  ->
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index b2d4f199c3..76588e6887 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -591,7 +591,7 @@ cast_to_list(X) -> lists:flatten(io_lib:format("~tw", [X])).
 %%%  this
 %%%
 pick_erl_program(default) ->
-    cast_to_list(lib:progname());
+    ct:get_progname();
 pick_erl_program(L) ->
     P = random_element(L),
     case P of
@@ -600,7 +600,7 @@ pick_erl_program(L) ->
 	{release, S} ->
 	    find_release(S);
 	this ->
-	    cast_to_list(lib:progname())
+	    ct:get_progname()
     end.
 
 %% This is an attempt to distinguish between spaces in the program
@@ -611,8 +611,8 @@ pick_erl_program(L) ->
 %% ({prog,String}) or if the -program switch to beam is used and
 %% includes arguments (typically done by cerl in OTP test environment
 %% in order to ensure that slave/peer nodes are started with the same
-%% emulator and flags as the test node. The return from lib:progname()
-%% could then typically be '/<full_path_to>/cerl -gcov').
+%% emulator and flags as the test node. The return from ct:get_progname()
+%% could then typically be "/<full_path_to>/cerl -gcov").
 quote_progname(Progname) ->
     do_quote_progname(string:lexemes(Progname," ")).