diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-06-20 10:02:19 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-06-20 10:02:19 +0200 |
| commit | d798caa64f4bb7509e89e6b8161c7eb196bc7270 (patch) | |
| tree | 1cdc9f8df2eebee496f5f7103e3d9b2dd94fb286 /lib/odbc/test/odbc_start_SUITE.erl | |
| parent | aa5fb1df25e9f37f798a00ec6206838d73306968 (diff) | |
| parent | e670d7bec29c5390f2f7a53a8730a0db4efc99d7 (diff) | |
| download | otp-d798caa64f4bb7509e89e6b8161c7eb196bc7270.tar.gz otp-d798caa64f4bb7509e89e6b8161c7eb196bc7270.tar.bz2 otp-d798caa64f4bb7509e89e6b8161c7eb196bc7270.zip | |
Merge branch 'ia/odbc/on-more-platforms' into dev
* ia/odbc/on-more-platforms:
Added code to handle old postgres drivers on solaris and running against postgres for linux 64 bits (MySQL 64 seems to be broken).
Enabled odbc tests on mac
Diffstat (limited to 'lib/odbc/test/odbc_start_SUITE.erl')
| -rw-r--r-- | lib/odbc/test/odbc_start_SUITE.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl index 65b990133f..440c0ca921 100644 --- a/lib/odbc/test/odbc_start_SUITE.erl +++ b/lib/odbc/test/odbc_start_SUITE.erl @@ -125,14 +125,16 @@ start(doc) -> start(suite) -> []; start(Config) when is_list(Config) -> - {error,odbc_not_started} = odbc:connect(?RDBMS:connection_string(), []), + PlatformOptions = odbc_test_lib:platform_options(), + {error,odbc_not_started} = odbc:connect(?RDBMS:connection_string(), + PlatformOptions), odbc:start(), - case odbc:connect(?RDBMS:connection_string(), []) of + case odbc:connect(?RDBMS:connection_string(), PlatformOptions) of {ok, Ref0} -> ok = odbc:disconnect(Ref0), odbc:stop(), {error,odbc_not_started} = - odbc:connect(?RDBMS:connection_string(), []), + odbc:connect(?RDBMS:connection_string(), PlatformOptions), start_odbc(transient), start_odbc(permanent); {error, odbc_not_started} -> @@ -144,7 +146,7 @@ start(Config) when is_list(Config) -> start_odbc(Type) -> ok = odbc:start(Type), - case odbc:connect(?RDBMS:connection_string(), []) of + case odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()) of {ok, Ref} -> ok = odbc:disconnect(Ref), odbc:stop(); |