aboutsummaryrefslogtreecommitdiffstats
path: root/lib/odbc/test/odbc_start_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-06-22 11:54:49 +0200
committerIngela Anderton Andin <[email protected]>2011-07-05 10:33:40 +0200
commit95a09939d033f8bf347f5196a9cccc4d3d34e056 (patch)
treea9f2f98fee80690b0255181859905c3038724cef /lib/odbc/test/odbc_start_SUITE.erl
parentee679e41535dd83aba7c8fb55fa12bdc6e89313c (diff)
downloadotp-95a09939d033f8bf347f5196a9cccc4d3d34e056.tar.gz
otp-95a09939d033f8bf347f5196a9cccc4d3d34e056.tar.bz2
otp-95a09939d033f8bf347f5196a9cccc4d3d34e056.zip
Skip test if not applicable
Skip tests on sles9 (do not need to support this old version and we have no working driver). Run linux 32 against MySQL and 64 against Postgres (as MySQL driver does not support parameterized queries on linux at the moment) Do not run Postgre on Solaris as driver does not work good, run MySQL on solaris and enable tests on Mac
Diffstat (limited to 'lib/odbc/test/odbc_start_SUITE.erl')
-rw-r--r--lib/odbc/test/odbc_start_SUITE.erl17
1 files changed, 12 insertions, 5 deletions
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.
%%--------------------------------------------------------------------