aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-01-25 12:17:16 +0100
committerLukas Larsson <[email protected]>2013-01-25 12:30:32 +0100
commitb965ba4bb051020e994c4563a220daac6fe9afde (patch)
tree65a81fd4d3a2b1992ba4ac7a860c77377708ed66 /erts/emulator
parent1342146f167f780d0b558fb78fdf421aef84b64f (diff)
downloadotp-b965ba4bb051020e994c4563a220daac6fe9afde.tar.gz
otp-b965ba4bb051020e994c4563a220daac6fe9afde.tar.bz2
otp-b965ba4bb051020e994c4563a220daac6fe9afde.zip
Do not crash init_per_suite when nif load fails
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/mtx_SUITE.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/erts/emulator/test/mtx_SUITE.erl b/erts/emulator/test/mtx_SUITE.erl
index 024c3456a8..22da84c808 100644
--- a/erts/emulator/test/mtx_SUITE.erl
+++ b/erts/emulator/test/mtx_SUITE.erl
@@ -58,8 +58,12 @@
init_per_suite(Config) when is_list(Config) ->
DataDir = ?config(data_dir, Config),
Lib = filename:join([DataDir, atom_to_list(?MODULE)]),
- ok = erlang:load_nif(Lib, none),
- Config.
+ case {erlang:load_nif(Lib, none),erlang:system_info(threads)} of
+ {{error,_},false} ->
+ {skip, "No thread support"};
+ _ ->
+ Config
+ end.
end_per_suite(Config) when is_list(Config) ->
catch erts_debug:set_internal_state(available_internal_state, false),