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(-) 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