aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-01-28 10:44:44 +0100
committerLukas Larsson <[email protected]>2013-01-28 10:44:44 +0100
commit1265cf07e3c4f1cf10fb2541951eae7ff35d25b4 (patch)
tree77dd0ff27c36a92f4e31572ef44c63f870098908 /erts/emulator
parentccee9910becf9df9830c0b2bc689b3f67620cd6a (diff)
parentb965ba4bb051020e994c4563a220daac6fe9afde (diff)
downloadotp-1265cf07e3c4f1cf10fb2541951eae7ff35d25b4.tar.gz
otp-1265cf07e3c4f1cf10fb2541951eae7ff35d25b4.tar.bz2
otp-1265cf07e3c4f1cf10fb2541951eae7ff35d25b4.zip
Merge branch 'lukas/r16a/testcases'
* lukas/r16a/testcases: 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),