diff options
| author | Björn Gustavsson <[email protected]> | 2015-12-17 07:31:21 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-12-17 07:31:21 +0100 |
| commit | a8714487f0856e728e4d2c324118425f07e55736 (patch) | |
| tree | 9b35e7bb0b6b267fb9e527787ae5d52a9617ed6f /lib/kernel/test | |
| parent | a985104c38d154b7d0f2eb8ccf9f8fe053b6aad5 (diff) | |
| parent | ef8a03c6dc3965ed56a746df524036b6b205feb9 (diff) | |
| download | otp-a8714487f0856e728e4d2c324118425f07e55736.tar.gz otp-a8714487f0856e728e4d2c324118425f07e55736.tar.bz2 otp-a8714487f0856e728e4d2c324118425f07e55736.zip | |
Merge branch 'bjorn/erts/clean-up-preloaded/OTP-13112'
* bjorn/erts/clean-up-preloaded/OTP-13112:
Update preloaded modules
erl_prim_loader doc: Remove mention of user supplied loader
erl_prim_loader: Clean up string_match()
erl_prim_loader: Avoid making absolute paths
erl_prim_loader: Clean up splitting of filenames
init: Eliminate the concat/1 function
Clean up start of erl_prim_loader
Remove erl_prim_loader:get_files/2
erl_prim_loader: Remove code for handling OSE
erl_prim_loader: Break loop/3 into two functions for readability
prim_file: Suppress a dialyzer warning
Reduce the ludicrous number of arguments for eval_script()
Clean up handling of boot_vars
init_SUITE: Correct the test for a "real system"
Remove useless 'catch' in start_it/1
Simplify get_flag() and get_flag_list()
Clean up parsing and lookup of flags
Diffstat (limited to 'lib/kernel/test')
| -rw-r--r-- | lib/kernel/test/init_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl index 54ab5aa566..3fe618ea4c 100644 --- a/lib/kernel/test/init_SUITE.erl +++ b/lib/kernel/test/init_SUITE.erl @@ -307,8 +307,8 @@ create_boot(Config) -> is_real_system(KernelVsn, StdlibVsn) -> LibDir = code:lib_dir(), - filelib:is_dir(filename:join(LibDir, "kernel"++KernelVsn)) andalso - filelib:is_dir(filename:join(LibDir, "stdlib"++StdlibVsn)). + filelib:is_dir(filename:join(LibDir, "kernel-"++KernelVsn)) andalso + filelib:is_dir(filename:join(LibDir, "stdlib-"++StdlibVsn)). %% ------------------------------------------------ %% Slave executes erlang:halt() on master nodedown. |