From a8bb5326db16858b955d7fe00793f81d39723cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Mon, 7 Mar 2016 15:19:46 +0100 Subject: multi_load_SUITE: Don't fail on non-HiPE systems --- lib/kernel/test/multi_load_SUITE.erl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/kernel/test/multi_load_SUITE.erl b/lib/kernel/test/multi_load_SUITE.erl index bb87443e36..f224624709 100644 --- a/lib/kernel/test/multi_load_SUITE.erl +++ b/lib/kernel/test/multi_load_SUITE.erl @@ -272,7 +272,12 @@ do_ensure_modules_loaded(Dir) -> true = is_loaded(Mod), true = is_loaded(OLMod), true = is_loaded(NativeMod), - true = NativeMod:module_info(native), + + ModuleNative = case erlang:system_info(hipe_architecture) of + undefined -> false; + _ -> true + end, + ModuleNative = NativeMod:module_info(native), ok. -- cgit v1.2.3 From 204b6be5b5d9a641404ae6cdf67faf0a3f542a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Mon, 7 Mar 2016 15:23:22 +0100 Subject: multi_load_SUITE: Clarify failure reasons The failure reasons remained from a previous draft of the API. --- lib/kernel/test/multi_load_SUITE.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/kernel/test/multi_load_SUITE.erl b/lib/kernel/test/multi_load_SUITE.erl index f224624709..fa8877e117 100644 --- a/lib/kernel/test/multi_load_SUITE.erl +++ b/lib/kernel/test/multi_load_SUITE.erl @@ -362,9 +362,9 @@ atomic_load_error(Modules, ErrorInFinishLoading) -> {B,B} -> Errors; {false,true} -> - ct:fail("LastAction fun must not be called"); + ct:fail("code:prepare_loading/1 should have failed"); {true,false} -> - ct:fail("LastAction fun was not called") + ct:fail("code:prepare_loading/1 should have succeeded") end. is_loaded(Mod) -> -- cgit v1.2.3 From 78205a14b3158c977581a9982a701f305c1103ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Mon, 7 Mar 2016 15:40:53 +0100 Subject: Skip erl_prim_loader_SUITE:get_modules/1 when cover-compiled code:which/1 will return 'cover_compiled' instead of a path. We could work around that, but since erl_prim_loader is not cover-compiled, it does not gain us anything. --- lib/kernel/test/erl_prim_loader_SUITE.erl | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl index bccca59b93..14d33cd330 100644 --- a/lib/kernel/test/erl_prim_loader_SUITE.erl +++ b/lib/kernel/test/erl_prim_loader_SUITE.erl @@ -112,6 +112,12 @@ get_file(Config) when is_list(Config) -> ok. get_modules(_Config) -> + case test_server:is_cover() of + false -> do_get_modules(); + true -> {skip,"Cover"} + end. + +do_get_modules() -> MsGood = lists:sort([lists,gen_server,gb_trees,code_server]), Ms = [certainly_not_existing|MsGood], SuccExp = [begin -- cgit v1.2.3 From daced2188902968b16cc7ada1782e395e1e2e938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Mon, 7 Mar 2016 15:48:32 +0100 Subject: erl_prim_loader_SUITE: Add debug printout --- lib/kernel/test/erl_prim_loader_SUITE.erl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl index 14d33cd330..55a5b1acf8 100644 --- a/lib/kernel/test/erl_prim_loader_SUITE.erl +++ b/lib/kernel/test/erl_prim_loader_SUITE.erl @@ -127,6 +127,9 @@ do_get_modules() -> end || M <- MsGood], FailExp = [{certainly_not_existing,enoent}], + io:format("SuccExp = ~p\n", [SuccExp]), + io:format("FailExp = ~p\n", [FailExp]), + Path = code:get_path(), Process = fun(_, F, Code) -> {ok,{F,erlang:md5(Code)}} end, {ok,{Succ,FailExp}} = erl_prim_loader:get_modules(Ms, Process, Path), -- cgit v1.2.3