diff options
author | Björn Gustavsson <[email protected]> | 2017-05-19 10:05:33 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2017-05-19 10:05:33 +0200 |
commit | 4fe2a04e8ad18436e92793b61cabb6e70434c293 (patch) | |
tree | 50a920621db47921e31976e08d08f24e7a88f31b /lib/kernel | |
parent | 05dce0f330c83278cb134c7235a5353ce4116307 (diff) | |
parent | caf36b503f6c43494a89e196a59aa69ad3156087 (diff) | |
download | otp-4fe2a04e8ad18436e92793b61cabb6e70434c293.tar.gz otp-4fe2a04e8ad18436e92793b61cabb6e70434c293.tar.bz2 otp-4fe2a04e8ad18436e92793b61cabb6e70434c293.zip |
Merge branch 'bjorn/cuddle-with-tests'
* bjorn/cuddle-with-tests:
code_SUITE: Remove unused functions
Eliminate warning for variable 'Config' being unused
compile_SUITE: Don't create a directory called 'core'
Don't crash in end_per_testcase/2 in code_SUITE:on_load_embedded/1
Diffstat (limited to 'lib/kernel')
-rw-r--r-- | lib/kernel/test/code_SUITE.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl index 7831777726..afc32283ba 100644 --- a/lib/kernel/test/code_SUITE.erl +++ b/lib/kernel/test/code_SUITE.erl @@ -107,14 +107,19 @@ init_per_testcase(big_boot_embedded, Config) -> _Else -> {skip, "Needs crypto!"} end; -init_per_testcase(on_load_embedded, Config) -> +init_per_testcase(on_load_embedded, Config0) -> LibRoot = code:lib_dir(), LinkName = filename:join(LibRoot, "on_load_app-1.0"), - [{link_name,LinkName}|Config]; + Config = [{link_name,LinkName}|Config0], + init_per_testcase(Config); init_per_testcase(_Func, Config) -> + init_per_testcase(Config). + +init_per_testcase(Config) -> P = code:get_path(), [{code_path, P}|Config]. + end_per_testcase(module_status, Config) -> code:purge(?TESTMOD), code:delete(?TESTMOD), |