diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-08-17 14:18:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-08-17 14:18:08 +0200 |
| commit | 51e952943128d9ae546bee3fc79e8cb8998dfb57 (patch) | |
| tree | d6a60cf581cbc566ead84e8174c7915eb7bdeafc /lib/odbc/test/odbc_start_SUITE.erl | |
| parent | 46af29aac0e851105620dab25644cf27219e2b0a (diff) | |
| parent | 95a09939d033f8bf347f5196a9cccc4d3d34e056 (diff) | |
| download | otp-51e952943128d9ae546bee3fc79e8cb8998dfb57.tar.gz otp-51e952943128d9ae546bee3fc79e8cb8998dfb57.tar.bz2 otp-51e952943128d9ae546bee3fc79e8cb8998dfb57.zip | |
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
Diffstat (limited to 'lib/odbc/test/odbc_start_SUITE.erl')
| -rw-r--r-- | lib/odbc/test/odbc_start_SUITE.erl | 17 |
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. %%-------------------------------------------------------------------- |