From b965ba4bb051020e994c4563a220daac6fe9afde Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Fri, 25 Jan 2013 12:17:16 +0100
Subject: Do not crash init_per_suite when nif load fails

---
 erts/emulator/test/mtx_SUITE.erl | 8 ++++++--
 1 file 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),
-- 
cgit v1.2.3