You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/07/31 23:31:35 UTC
[41/50] meck commit: updated refs/heads/master to dde7590
Fix cover_empty_compile_opts regex
Project: http://git-wip-us.apache.org/repos/asf/couchdb-meck/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-meck/commit/59d7a504
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-meck/tree/59d7a504
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-meck/diff/59d7a504
Branch: refs/heads/master
Commit: 59d7a504466efe2c67ace5971cf4e2dc7c7419b6
Parents: 20792b8
Author: Myers Carpenter <my...@maski.org>
Authored: Fri Mar 21 17:30:32 2014 -0400
Committer: Myers Carpenter <my...@maski.org>
Committed: Fri Mar 21 17:30:32 2014 -0400
----------------------------------------------------------------------
test.config | 2 +-
test/meck_tests.erl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-meck/blob/59d7a504/test.config
----------------------------------------------------------------------
diff --git a/test.config b/test.config
index 17a9a8f..a8a4750 100644
--- a/test.config
+++ b/test.config
@@ -6,9 +6,9 @@
%% Compiler Options ===========================================================
% FIXME: Add warnings_as_errors once Hamcrest is fixed
{erl_opts, [
- {platform_define, "R14|R15|R16(B0[1-2])?", cover_empty_compile_opts},
%% Erlang releases after 17 don't put R in front of their name, and also require dict() to be written like dict:dict()
{platform_define, "^[0-9]+", 'NAMESPACED_DICTS'},
+ {platform_define, "^R(?!16B03)", cover_empty_compile_opts},
debug_info
]}.
http://git-wip-us.apache.org/repos/asf/couchdb-meck/blob/59d7a504/test/meck_tests.erl
----------------------------------------------------------------------
diff --git a/test/meck_tests.erl b/test/meck_tests.erl
index 3f472a2..547aa50 100644
--- a/test/meck_tests.erl
+++ b/test/meck_tests.erl
@@ -986,7 +986,7 @@ cover_options_({_OldPath, Src, Module}) ->
% 2 instead of 3, as above
?assertEqual({ok, {Module, {2,0}}}, cover:analyze(Module, module)).
--ifndef(cover_empty_compile_opts).
+-ifdef(cover_empty_compile_opts).
-define(compile_options, []).
-else.
-define(compile_options, [{i,"../test/include"},{d,'TEST',true}]).