Merge remote branch 'upstream/dev' into dev

1 files changed, 20 insertions, 14 deletions

diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index e59be772e3..a076c4dfff 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -76,20 +76,26 @@ end_per_group(_GroupName, Config) ->
 %% Note: This function is free to add any key/value pairs to the Config
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    case (catch odbc:start()) of
-	ok ->
-	    case catch odbc:connect(?RDBMS:connection_string(),
-				    [{auto_commit, off}] ++ odbc_test_lib:platform_options()) of
-		{ok, Ref} ->
-		    odbc:disconnect(Ref),
-		    [{tableName, odbc_test_lib:unique_table_name()} | Config];
-		_  ->
-		    {skip, "ODBC is not properly setup"}
-	    end;
-	_ ->
-	    {skip,"ODBC not startable"}
-    end.	    
+init_per_suite(Config) when is_list(Config) ->
+    case odbc_test_lib:skip() of
+	true ->
+	    {skip, "ODBC not supported"};
+	false ->
+	    case (catch odbc:start()) of
+		ok ->
+		    case catch odbc:connect(?RDBMS:connection_string(),
+					    [{auto_commit, off}] ++ odbc_test_lib:platform_options()) of
+			{ok, Ref} ->
+			    odbc:disconnect(Ref),
+			    [{tableName, odbc_test_lib:unique_table_name()} | Config];
+			_  ->
+			    {skip, "ODBC is not properly setup"}
+		    end;
+		_ ->
+		    {skip,"ODBC not startable"}
+	    end
+    end.
+
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]