--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 2BC2B429E28\r
+ for <notmuch@notmuchmail.org>; Sun, 9 Jun 2013 04:04:09 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id kt2teqWouZMv for <notmuch@notmuchmail.org>;\r
+ Sun, 9 Jun 2013 04:04:01 -0700 (PDT)\r
+Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com\r
+ [209.85.217.177]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 24325431FAE\r
+ for <notmuch@notmuchmail.org>; Sun, 9 Jun 2013 04:03:40 -0700 (PDT)\r
+Received: by mail-lb0-f177.google.com with SMTP id 10so4963573lbf.8\r
+ for <notmuch@notmuchmail.org>; Sun, 09 Jun 2013 04:03:38 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+ :in-reply-to:references:x-gm-message-state;\r
+ bh=b7qFPTVmDcYsc5kFkj73erswYlfyc2vtX4m1bFU8D1c=;\r
+ b=msJ/i1Max4851xVhbNt4NStNHSO30GuadSnlcPOy/E5WdXTZKW6SFVBJyCs4p6L0rL\r
+ HD95QKOwEMGAVqsnZC2F5Cypug5pmNLAmstWOxnRPmtXhHgfjdyuc7oL3KeqL4SdqfI4\r
+ IRiUT0dJ7oMXzXmJgaxpJU2W7Rv/ANHXcbFepH9MvlTXJmrO/f1giZsW8kc3QUGbCQFK\r
+ uJAxs5VVQibPfEYx2XsbjeuCtWSlp5juhrG4SMBe7id6IvGh/6vf+xb3MFHD4ZNgr/dh\r
+ I+BOXCwTo4g4HkIKUYvMv/Igk6igKXAPK8/93OLzWRalUkQ8feHSPAAJieO+NDwTyMUX\r
+ g5SA==\r
+X-Received: by 10.152.88.105 with SMTP id bf9mr1173817lab.38.1370775818658;\r
+ Sun, 09 Jun 2013 04:03:38 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c376-211.dhcp.inet.fi.\r
+ [88.195.118.211])\r
+ by mx.google.com with ESMTPSA id w9sm2080603lbk.7.2013.06.09.04.03.36\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sun, 09 Jun 2013 04:03:37 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 5/7] test: test notmuch count --output=files\r
+Date: Sun, 9 Jun 2013 14:03:11 +0300\r
+Message-Id:\r
+ <9da399e33dc5cde22aabd3015dfd36dc98f67f45.1370775663.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <cover.1370775663.git.jani@nikula.org>\r
+References: <cover.1370775663.git.jani@nikula.org>\r
+In-Reply-To: <cover.1370775663.git.jani@nikula.org>\r
+References: <cover.1370775663.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQkITjr2+5swj292oezlf+pmQxbJt93bo+ri3pdd3E/4x7SQ+2d/K/PostQqK6PCULHpR4wS\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 09 Jun 2013 11:04:09 -0000\r
+\r
+---\r
+ test/count | 10 ++++++++++\r
+ 1 file changed, 10 insertions(+)\r
+\r
+diff --git a/test/count b/test/count\r
+index 05713fd..da86c8c 100755\r
+--- a/test/count\r
++++ b/test/count\r
+@@ -28,6 +28,16 @@ test_expect_equal \\r
+ "$((`notmuch search '*' | wc -l`))" \\r
+ "`notmuch count --output=threads '*'`"\r
+ \r
++test_begin_subtest "files count"\r
++test_expect_equal \\r
++ "$((`notmuch search --output=files '*' | wc -l`))" \\r
++ "`notmuch count --output=files '*'`"\r
++\r
++test_begin_subtest "files count for a duplicate message-id"\r
++test_expect_equal \\r
++ "2" \\r
++ "`notmuch count --output=files id:20091117232137.GA7669@griffis1.net`"\r
++\r
+ test_begin_subtest "count with no matching messages"\r
+ test_expect_equal \\r
+ "0" \\r
+-- \r
+1.7.10.4\r
+\r