couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [30/50] meck commit: updated refs/heads/master to dde7590
Date Thu, 31 Jul 2014 21:31:24 GMT
Revert "Make test pass on R16B03+"

This reverts commit c6bcda61252d5e7578995024acf3fa2ba0ef9c2c.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-meck/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-meck/commit/a1e0519e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-meck/tree/a1e0519e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-meck/diff/a1e0519e

Branch: refs/heads/master
Commit: a1e0519e4eb122b22887d7935e579afdf1480214
Parents: deda700
Author: Adam Lindberg <hello@alind.io>
Authored: Fri Mar 14 14:46:31 2014 +0100
Committer: Adam Lindberg <hello@alind.io>
Committed: Fri Mar 14 14:46:31 2014 +0100

----------------------------------------------------------------------
 rebar.config        | 3 +--
 test/meck_tests.erl | 8 +-------
 2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-meck/blob/a1e0519e/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index fc08b55..35af113 100644
--- a/rebar.config
+++ b/rebar.config
@@ -6,8 +6,7 @@
     warn_obsolete_guard,
     warn_unused_import,
     warnings_as_errors,
-    debug_info,
-    {platform_define, "(R14|R15|R16(?!B03))", cover_squash_comiple_opts}
+    debug_info
 ]}.
 
 %% Misc =======================================================================

http://git-wip-us.apache.org/repos/asf/couchdb-meck/blob/a1e0519e/test/meck_tests.erl
----------------------------------------------------------------------
diff --git a/test/meck_tests.erl b/test/meck_tests.erl
index 4761603..901ab84 100644
--- a/test/meck_tests.erl
+++ b/test/meck_tests.erl
@@ -986,12 +986,6 @@ cover_options_({_OldPath, Src, Module}) ->
     % 2 instead of 3, as above
     ?assertEqual({ok, {Module, {2,0}}}, cover:analyze(Module, module)).
 
--ifdef(cover_squash_compile_opts).
--define(copts, []).
--else.
--define(copts, [{i,"../test/include"},{d,'TEST',true}]).
--endif.
-
 cover_options_fail_({_OldPath, Src, Module}) ->
     %% This may look like the test above but there is a subtle
     %% difference.  When `cover:compile_beam' is called it squashes
@@ -1003,7 +997,7 @@ cover_options_fail_({_OldPath, Src, Module}) ->
     {ok, _} = compile:file(Src, CompilerOptions),
     ?assertEqual(CompilerOptions, meck_code:compile_options(Module)),
     {ok, _} = cover:compile_beam(Module),
-    ?assertEqual(?copts, meck_code:compile_options(Module)),
+    ?assertEqual([], meck_code:compile_options(Module)),
     a      = Module:a(),
     b      = Module:b(),
     {1, 2} = Module:c(1, 2),


Mime
View raw message