diff options
| author | Anders Svensson <[email protected]> | 2011-08-24 16:44:16 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-08-24 16:44:16 +0200 |
| commit | 3536111957c809976ed3e7091e85960990be904d (patch) | |
| tree | aafc4cf4f996ece272e6b9c3d2366061c34f08da /lib/odbc/test/odbc_query_SUITE.erl | |
| parent | a7c0e439ee84d25ce18f65959be06315063a7de8 (diff) | |
| parent | 0c09797c725c98e5466bf6c575b7be4f2fc0e813 (diff) | |
| download | otp-3536111957c809976ed3e7091e85960990be904d.tar.gz otp-3536111957c809976ed3e7091e85960990be904d.tar.bz2 otp-3536111957c809976ed3e7091e85960990be904d.zip | |
Merge remote branch 'upstream/dev' into dev
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. %%-------------------------------------------------------------------- |