Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8116711DF3 for ; Thu, 31 Jul 2014 21:30:57 +0000 (UTC) Received: (qmail 87571 invoked by uid 500); 31 Jul 2014 21:30:56 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 87430 invoked by uid 500); 31 Jul 2014 21:30:56 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 86709 invoked by uid 99); 31 Jul 2014 21:30:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jul 2014 21:30:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BCDB0951A40; Thu, 31 Jul 2014 21:30:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Thu, 31 Jul 2014 21:31:07 -0000 Message-Id: <759a297f0b0c4791a6ebf8f45085c12c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/50] meck commit: updated refs/heads/master to dde7590 Merge branch 'develop' Conflicts: README.md Project: http://git-wip-us.apache.org/repos/asf/couchdb-meck/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-meck/commit/f6ee2945 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-meck/tree/f6ee2945 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-meck/diff/f6ee2945 Branch: refs/heads/master Commit: f6ee2945173f10b16685e67f785f421129a9aaaf Parents: 161e240 52ec973 Author: Adam Lindberg Authored: Sat Aug 17 13:32:24 2013 +0200 Committer: Adam Lindberg Committed: Sat Aug 17 13:32:24 2013 +0200 ---------------------------------------------------------------------- .gitignore | 3 + .travis.yml | 10 +- CHANGELOG | 3 +- Makefile | 63 +- dialyzer.ignore-warnings | 5 + rebar | Bin 0 -> 135567 bytes rebar.config | 5 +- src/meck.erl | 1150 ++++++++++++--------------- src/meck_abstract.hrl | 19 - src/meck_args_matcher.erl | 126 +++ src/meck_code.erl | 118 +++ src/meck_code_gen.erl | 198 +++++ src/meck_cover.erl | 22 +- src/meck_expect.erl | 139 ++++ src/meck_history.erl | 131 +++ src/meck_matcher.erl | 83 ++ src/meck_mod.erl | 118 --- src/meck_proc.erl | 641 +++++++++++++++ src/meck_ret_spec.erl | 140 ++++ src/meck_util.erl | 44 + test.config | 15 + test/meck_args_matcher_tests.erl | 59 ++ test/meck_expect_tests.erl | 107 +++ test/meck_history_tests.erl | 83 ++ test/meck_matcher_tests.erl | 48 ++ test/meck_performance_test.erl | 12 +- test/meck_ret_spec_tests.erl | 68 ++ test/meck_test_module.erl | 1 + test/meck_test_parametrized_module.erl | 7 - test/meck_tests.erl | 648 +++++++++++++-- 30 files changed, 3176 insertions(+), 890 deletions(-) ----------------------------------------------------------------------