diff options
Diffstat (limited to 'lib/kernel/test/multi_load_SUITE.erl')
-rw-r--r-- | lib/kernel/test/multi_load_SUITE.erl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/kernel/test/multi_load_SUITE.erl b/lib/kernel/test/multi_load_SUITE.erl index bb87443e36..fa8877e117 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. @@ -357,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) -> |