diff options
| author | Siri Hansen <[email protected]> | 2018-11-28 11:40:59 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2018-11-28 11:40:59 +0100 |
| commit | da90cf437e07f0f21b15e0d0ea8ff38cbc0bb1ea (patch) | |
| tree | ce79a294a5da29fe01593895a634b13d56f1f009 /lib/reltool/test | |
| parent | c326c098ad41ea99f731cbb26416e07c0921b721 (diff) | |
| parent | f20d86b7994596ace8713b61af0925d273a7f03e (diff) | |
| download | otp-da90cf437e07f0f21b15e0d0ea8ff38cbc0bb1ea.tar.gz otp-da90cf437e07f0f21b15e0d0ea8ff38cbc0bb1ea.tar.bz2 otp-da90cf437e07f0f21b15e0d0ea8ff38cbc0bb1ea.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/reltool/test')
| -rw-r--r-- | lib/reltool/test/reltool_server_SUITE.erl | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl index fc976bfb94..990bd5c217 100644 --- a/lib/reltool/test/reltool_server_SUITE.erl +++ b/lib/reltool/test/reltool_server_SUITE.erl @@ -142,7 +142,8 @@ all() -> use_selected_vsn, use_selected_vsn_relative_path, non_standard_vsn_id, - undefined_regexp]. + undefined_regexp, + windows_erl_libs]. groups() -> []. @@ -2546,10 +2547,21 @@ undefined_regexp(_Config) -> ok. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% Checks that reltool_utils can correctly read Windows ERL_LIBS + +windows_erl_libs(_Config) -> + WinErlLibs = + "C:\\Program Files\\Erlang Libs;C:\\Program Files\\More Erlang Libs", + Ret = reltool_utils:erl_libs(WinErlLibs, {win32, nt}), + ?m(["C:\\Program Files\\Erlang Libs","C:\\Program Files\\More Erlang Libs"], + Ret), + ok. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Library functions erl_libs() -> - string:lexemes(os:getenv("ERL_LIBS", ""), ":;"). + reltool_utils:erl_libs(). datadir(Config) -> %% Removes the trailing slash... |