diff options
author | Hans Bolinder <[email protected]> | 2018-05-16 15:13:25 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2018-05-16 15:13:25 +0200 |
commit | 455fde56f533bd80d1a9d37058c3381521e201ba (patch) | |
tree | ca067697a333f39ec589535e13ae2852e949cd8c /lib/common_test/test_server | |
parent | 84e655feccb4780b8db17a42549b35ded03baf1a (diff) | |
parent | 275f51a34c1c2d9c4d31dad918a7a3b5c3631313 (diff) | |
download | otp-455fde56f533bd80d1a9d37058c3381521e201ba.tar.gz otp-455fde56f533bd80d1a9d37058c3381521e201ba.tar.bz2 otp-455fde56f533bd80d1a9d37058c3381521e201ba.zip |
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
Diffstat (limited to 'lib/common_test/test_server')
-rw-r--r-- | lib/common_test/test_server/ts_erl_config.erl | 10 | ||||
-rw-r--r-- | lib/common_test/test_server/ts_run.erl | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/common_test/test_server/ts_erl_config.erl b/lib/common_test/test_server/ts_erl_config.erl index c7fe4ccf83..e37fa844bb 100644 --- a/lib/common_test/test_server/ts_erl_config.erl +++ b/lib/common_test/test_server/ts_erl_config.erl @@ -358,7 +358,15 @@ link_library(_LibName,_Other) -> %% Returns emulator specific variables. emu_vars(Vars) -> [{is_source_build, is_source_build()}, - {erl_name, atom_to_list(lib:progname())}|Vars]. + {erl_name, get_progname()}|Vars]. + +get_progname() -> + case init:get_argument(progname) of + {ok, [[Prog]]} -> + Prog; + _Other -> + "no_prog_name" + end. is_source_build() -> string:find(erlang:system_info(system_version), "source") =/= nomatch. diff --git a/lib/common_test/test_server/ts_run.erl b/lib/common_test/test_server/ts_run.erl index 3f594236bc..5dbbaca916 100644 --- a/lib/common_test/test_server/ts_run.erl +++ b/lib/common_test/test_server/ts_run.erl @@ -199,7 +199,7 @@ make_command(Vars, Spec, State) -> TestPath = filename:nativename(TestDir), Erl = case os:getenv("TS_RUN_VALGRIND") of false -> - atom_to_list(lib:progname()); + ct:get_progname(); _ -> case State#state.file of Dir when is_list(Dir) -> |