aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-09-06 14:12:01 +0200
committerLukas Larsson <[email protected]>2013-09-06 14:12:01 +0200
commit68e94c10f2e06d44de0ffaa56513b34ef17cc697 (patch)
tree5189a7885aada1314a21f35c0511740ee8b9f9d2 /lib
parentf0d9bb05045d9d991df60f3f69fef0054588f168 (diff)
parent30c4078cf1a898dfbca2dc8d00655bd766c0fbb1 (diff)
downloadotp-68e94c10f2e06d44de0ffaa56513b34ef17cc697.tar.gz
otp-68e94c10f2e06d44de0ffaa56513b34ef17cc697.tar.bz2
otp-68e94c10f2e06d44de0ffaa56513b34ef17cc697.zip
Merge branch 'maint'
* maint: Ignore odbc cores Cross compilation is now a supported feature
Diffstat (limited to 'lib')
-rw-r--r--lib/odbc/test/odbc_connect_SUITE.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 74ae2c96e6..2a16388929 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -77,6 +77,8 @@ end_per_group(_GroupName, Config) ->
%% variable, but should NOT alter/remove any existing entries.
%%--------------------------------------------------------------------
init_per_suite(Config) when is_list(Config) ->
+ file:write_file(filename:join([proplists:get_value(priv_dir,Config),
+ "..","..","..","ignore_core_files"]),""),
case odbc_test_lib:skip() of
true ->
{skip, "ODBC not supported"};