aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-03-07 15:19:46 +0100
committerBjörn Gustavsson <[email protected]>2016-03-07 15:19:46 +0100
commita8bb5326db16858b955d7fe00793f81d39723cee (patch)
tree3f0e273db6bae620fc5d5e0cda91e2488992eb49
parentcbc122135a638da7b8bd74c6725b12da786c93f3 (diff)
downloadotp-a8bb5326db16858b955d7fe00793f81d39723cee.tar.gz
otp-a8bb5326db16858b955d7fe00793f81d39723cee.tar.bz2
otp-a8bb5326db16858b955d7fe00793f81d39723cee.zip
multi_load_SUITE: Don't fail on non-HiPE systems
-rw-r--r--lib/kernel/test/multi_load_SUITE.erl7
1 files changed, 6 insertions, 1 deletions
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.