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 /erts/emulator/test/port_SUITE.erl | |
| 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 'erts/emulator/test/port_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/port_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
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(), |