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_test_lib.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_test_lib.erl')
-rw-r--r-- | lib/odbc/test/odbc_test_lib.erl | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl index 9956d74d24..3e78105cf3 100644 --- a/lib/odbc/test/odbc_test_lib.erl +++ b/lib/odbc/test/odbc_test_lib.erl @@ -38,18 +38,7 @@ match_float(Float, Match, Delta) -> odbc_check() -> case erlang:system_info(wordsize) of 4 -> - case test_server:os_type() of - {unix, sunos} -> - ok; - {unix, linux} -> - ok; - {win32, _} -> - ok; - Other -> - lists:flatten( - io_lib:format("Platform not supported: ~w", - [Other])) - end; + ok; Other -> case os:type() of {unix, linux} -> @@ -80,3 +69,11 @@ strict(Ref, mysql) -> odbc:sql_query(Ref, "SET sql_mode='STRICT_ALL_TABLES,STRICT_TRANS_TABLES';"); strict(_,_) -> ok. + +platform_options() -> + case os:type() of + {unix, sunos} -> + [{scrollable_cursors, off}]; + _ -> + [] + end. |