diff options
author | Ingela Anderton Andin <[email protected]> | 2011-06-22 11:54:49 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-07-05 10:33:40 +0200 |
commit | 95a09939d033f8bf347f5196a9cccc4d3d34e056 (patch) | |
tree | a9f2f98fee80690b0255181859905c3038724cef /lib/odbc/test/odbc_query_SUITE.erl | |
parent | ee679e41535dd83aba7c8fb55fa12bdc6e89313c (diff) | |
download | otp-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_query_SUITE.erl')
-rw-r--r-- | lib/odbc/test/odbc_query_SUITE.erl | 16 |
1 files changed, 11 insertions, 5 deletions
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. %%-------------------------------------------------------------------- |