aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-09-28 09:10:48 +0200
committerIngela Anderton Andin <[email protected]>2011-09-28 09:10:48 +0200
commitcbb7313a14f83b3947c9d2067f5ebcabc0c0b3a0 (patch)
treefeff6930a98a98c23d1144ffeb969fc723cff770 /lib
parent7d936aabd1573c0a7d3bd5bc94e4996e60ba2f72 (diff)
parent101d00d11e4e2c24cc5d54739e348aa34527e315 (diff)
downloadotp-cbb7313a14f83b3947c9d2067f5ebcabc0c0b3a0.tar.gz
otp-cbb7313a14f83b3947c9d2067f5ebcabc0c0b3a0.tar.bz2
otp-cbb7313a14f83b3947c9d2067f5ebcabc0c0b3a0.zip
Merge branch 'ia/odbc/temp-disable-mac-tests' into dev
* ia/odbc/temp-disable-mac-tests: Temporary disable tests on MAC due to issus with the MAC ODBC drivers
Diffstat (limited to 'lib')
-rw-r--r--lib/odbc/test/odbc_test_lib.erl29
1 files changed, 18 insertions, 11 deletions
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl
index 4d7d1ae2fa..a8439d5fb6 100644
--- a/lib/odbc/test/odbc_test_lib.erl
+++ b/lib/odbc/test/odbc_test_lib.erl
@@ -36,18 +36,25 @@ match_float(Float, Match, Delta) ->
(Float < Match + Delta) and (Float > Match - Delta).
odbc_check() ->
- case erlang:system_info({wordsize, external}) of
- 4 ->
- ok;
- Other ->
- case os:type() of
- {unix, linux} ->
+ case os:type() of
+ {unix,darwin} ->
+ lists:flatten(
+ io_lib:format("Currently we have no working drivers for MAC",
+ []));
+ _ ->
+ case erlang:system_info({wordsize, external}) of
+ 4 ->
ok;
- Platform ->
- lists:flatten(
- io_lib:format("Word on platform ~w size"
- " ~w not supported", [Other,
- Platform]))
+ Other ->
+ case os:type() of
+ {unix, linux} ->
+ ok;
+ Platform ->
+ lists:flatten(
+ io_lib:format("Word on platform ~w size"
+ " ~w not supported", [Other,
+ Platform]))
+ end
end
end.