diff options
| author | Björn Gustavsson <[email protected]> | 2016-03-09 10:26:28 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-03-09 10:26:28 +0100 |
| commit | 21e395b93eafe68544b7ee5dd186c01bcfc5d02e (patch) | |
| tree | 2edba65235d8c1da4aa08e34f2c8343e54b5a735 /lib/kernel | |
| parent | fa86be90274abf69451007db04fd4d21257c1843 (diff) | |
| parent | b68ec56d44ff7f94289670ca0f10c8bbce927be5 (diff) | |
| download | otp-21e395b93eafe68544b7ee5dd186c01bcfc5d02e.tar.gz otp-21e395b93eafe68544b7ee5dd186c01bcfc5d02e.tar.bz2 otp-21e395b93eafe68544b7ee5dd186c01bcfc5d02e.zip | |
Merge branch 'maint'
* maint:
io_SUITE: Don't fail on fast computers with rough timers
Fix code_SUITE after test_server change
Set default value for crash_dump_dir
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/test/code_SUITE.erl | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl index 00f29aa8ed..13d3809ef6 100644 --- a/lib/kernel/test/code_SUITE.erl +++ b/lib/kernel/test/code_SUITE.erl @@ -966,9 +966,8 @@ mult_lib_roots(Config) when is_list(Config) -> ?t:start_node(mult_lib_roots, slave, [{args,"-env ERL_LIBS "++ErlLibs}]), - TSPath = filename:dirname(code:which(test_server)), Path0 = rpc:call(Node, code, get_path, []), - [TSPath,"."|Path1] = Path0, + ["."|Path1] = Path0, [Kernel|Path2] = Path1, [Stdlib|Path3] = Path2, mult_lib_verify_lib(Kernel, "kernel"), @@ -1012,16 +1011,19 @@ mult_lib_remove_prefix([$/|T], []) -> T. bad_erl_libs(Config) when is_list(Config) -> {ok,Node} = - ?t:start_node(mult_lib_roots, slave, - [{args,"-env ERL_LIBS "}]), - + ?t:start_node(bad_erl_libs, slave, []), + Code = rpc:call(Node,code,get_path,[]), ?t:stop_node(Node), {ok,Node2} = - ?t:start_node(mult_lib_roots, slave, + ?t:start_node(bad_erl_libs, slave, [{args,"-env ERL_LIBS /no/such/dir"}]), - + Code2 = rpc:call(Node,code,get_path,[]), ?t:stop_node(Node2), + + %% Test that code path is not affected by the faulty ERL_LIBS + Code == Code2, + ok. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |