Merge branch 'ia/odbc/skip-tests-because-of-driver-issues' into dev

* ia/odbc/skip-tests-because-of-driver-issues:
  Skip test if not applicable

8 files changed, 111 insertions, 39 deletions

diff --git a/lib/odbc/test/mysql.erl b/lib/odbc/test/mysql.erl
index 49068c4356..c990793213 100644
--- a/lib/odbc/test/mysql.erl
+++ b/lib/odbc/test/mysql.erl
@@ -26,7 +26,22 @@
 
 %-------------------------------------------------------------------------
 connection_string() ->
-    "DSN=MySQL;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';".
+    case test_server:os_type() of
+	{unix, linux} ->
+	    "DSN=MySQL;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';";
+	{unix, sunos} ->
+	    solaris_str();
+	{unix, darwin} ->
+	    "DSN=MySQLMac;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';"
+    end.
+
+solaris_str() ->
+    case erlang:system_info(system_architecture) of
+	"sparc" ++ _ ->
+	    "DSN=MySQLSolaris10;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';";
+	"i386" ++ _ ->
+	    "DSN=MySQLSolaris10i386;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';"
+    end.
 
 %-------------------------------------------------------------------------
 insert_result() ->
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()]
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index 099ae0aa7d..323190dd99 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -115,14 +115,18 @@ 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 ->
-	    [{tableName, odbc_test_lib:unique_table_name()} | Config];
-	_ ->
-	    {skip, "ODBC not startable"}
+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 ->
+		    [{tableName, odbc_test_lib:unique_table_name()}| Config];
+		_ ->
+		    {skip, "ODBC not startable"}
+	    end
     end.
-
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index 76a214d553..1852678b4b 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -89,6 +89,7 @@ init_per_group(scrollable_cursors, Config) ->
 	_ ->
 	    Config
     end;
+
 init_per_group(_,Config) ->
     Config.
 
@@ -105,11 +106,16 @@ end_per_group(_GroupName, Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) when is_list(Config) ->
-    case (catch odbc:start()) of
-	ok ->
-	    [{tableName, odbc_test_lib:unique_table_name()}| Config];
-	_ ->
-	    {skip, "ODBC not startable"}
+    case odbc_test_lib:skip() of
+	true ->
+	    {skip, "ODBC not supported"};
+	false ->
+	    case (catch odbc:start()) of
+		ok ->
+		    [{tableName, odbc_test_lib:unique_table_name()}| Config];
+		_ ->
+		    {skip, "ODBC not startable"}
+	    end
     end.
 
 %%--------------------------------------------------------------------
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index 440c0ca921..e3a3440559 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -39,11 +39,18 @@
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    case code:which(odbc) of
-	non_existing ->
-	    {skip, "No ODBC built"};
-	_ ->
-	    [{tableName, odbc_test_lib:unique_table_name()} | Config]
+    case odbc_test_lib:skip() of
+	true ->
+	    {skip, "ODBC not supported"};
+	false ->
+	    case code:which(odbc) of
+		non_existing ->
+		    {skip, "No ODBC built"};
+		_ ->
+		    %% Make sure odbc is not already started
+		    odbc:stop(),
+		    [{tableName, odbc_test_lib:unique_table_name()} | Config]
+	    end
     end.
 
 %%--------------------------------------------------------------------
diff --git a/lib/odbc/test/odbc_test.hrl b/lib/odbc/test/odbc_test.hrl
index 397d04756b..f7bb338a7f 100644
--- a/lib/odbc/test/odbc_test.hrl
+++ b/lib/odbc/test/odbc_test.hrl
@@ -25,14 +25,16 @@
 
 -define(RDBMS, case os:type() of
 		   {unix, sunos} ->
-		       postgres;
+		       mysql;
 		   {unix,linux} ->
-		       case erlang:system_info(wordsize) of
+		       case  erlang:system_info({wordsize, external}) of
 			   4 ->
 			       mysql;
 			   _ ->
 			       postgres
 		       end;
+		   {unix, darwin} ->
+		       mysql;
 		   {win32, _} ->
 		       sqlserver
 	       end).
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl
index 3e78105cf3..2d6bf5fcac 100644
--- a/lib/odbc/test/odbc_test_lib.erl
+++ b/lib/odbc/test/odbc_test_lib.erl
@@ -36,7 +36,7 @@ match_float(Float, Match, Delta) ->
     (Float < Match + Delta) and (Float > Match - Delta).
 
 odbc_check() ->
-    case erlang:system_info(wordsize) of
+    case erlang:system_info({wordsize, external}) of
 	4 ->
 	    ok;
 	Other ->
@@ -71,9 +71,36 @@ strict(_,_) ->
     ok.
 
 platform_options() ->
+    [].
+
+skip() ->
     case os:type() of
+	{unix, linux} ->
+	    Issue = linux_issue(),
+	    is_sles9(Issue);
 	{unix, sunos} ->
-	    [{scrollable_cursors, off}];
+	    not supported_solaris();
+	_ ->
+	    false
+    end.
+
+supported_solaris() ->
+    case os:version() of
+	{_,10,_} ->
+	    true;
 	_ ->
-	    []
+	    false
     end.
+
+linux_issue() ->
+    {ok, Binary} = file:read_file("/etc/issue"),
+    string:tokens(binary_to_list(Binary), " ").
+
+is_sles11(IssueTokens) ->
+    lists:member(11, IssueTokens).
+
+is_sles10(IssueTokens) ->
+    lists:member(10, IssueTokens).
+
+is_sles9(IssueTokens) ->
+    lists:member(9, IssueTokens).
diff --git a/lib/odbc/test/postgres.erl b/lib/odbc/test/postgres.erl
index 26a2913d46..d564dbd5ff 100644
--- a/lib/odbc/test/postgres.erl
+++ b/lib/odbc/test/postgres.erl
@@ -30,7 +30,7 @@ connection_string() ->
 	{unix, sunos} ->
 	    "DSN=Postgres;UID=odbctest";
 	{unix, linux} ->
-	    Size = erlang:system_info(wordsize),
+	    Size = erlang:system_info({wordsize, external}),
 	    linux_dist_connection_string(Size)  
     end.
 
@@ -43,7 +43,12 @@ linux_dist_connection_string(4) ->
     end;
 
 linux_dist_connection_string(_) ->
-    "DSN=PostgresLinux64;UID=odbctest".
+    case linux_dist() of
+	"ubuntu" ->
+	    "DSN=PostgresLinux64Ubuntu;UID=odbctest";
+	_ ->
+	    "DSN=PostgresLinux64;UID=odbctest"
+    end.
 			
 linux_dist() ->
     case file:read_file("/etc/issue") of