--- /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 EE8A0429E40\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:24 -0800 (PST)\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 C36G6Zt1ge40 for <notmuch@notmuchmail.org>;\r
+ Sat, 22 Feb 2014 14:26:20 -0800 (PST)\r
+Received: from mail-ea0-f180.google.com (mail-ea0-f180.google.com\r
+ [209.85.215.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 5EA4E431FD6\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:04 -0800 (PST)\r
+Received: by mail-ea0-f180.google.com with SMTP id o10so2314447eaj.39\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:01 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=1l+JBvp/jI1uvVkIr0JA2eaNUzm4IAfD8xtQZKaiePw=;\r
+ b=XBDOuYd7ZlUxKRnqKwqHyY9/ncV/CkYmkLr6RCQuimnW3ksBvissNmRflemZ0/vzlI\r
+ Tgn8BS19K2YSyQASZ97Y4LoIEXy3Au/GwvrxY/sQcbN8ZqJ3+n0oS2zFz2pkHCr0XMV5\r
+ /dnF9MUTznfnhY917G4dNc0UkExDqqp9GyZpoVJQ0LSCyr0t87pgyAjeE0RobfrZqYVS\r
+ mBR3dcvQ2aNFODcRzObOmP/DebYp8Y894gz2P9DVBjhHBNQ8XenRnX4Fl2E6qbM3ul7t\r
+ 2uiND3IpVtZWdavL1BbiL1oA2KckSoa/jv+yjwofPeqosgcUOHOk7+d7kzzbJp/L7k0p\r
+ h3og==\r
+X-Gm-Message-State:\r
+ ALoCoQn4qpCdT8GNRAx4YH4mxrvYXitoDN0sFGgB+9gYZl6ISOML6LVEDcByjAEWdqhGoTMYqanz\r
+X-Received: by 10.15.74.130 with SMTP id j2mr16357855eey.116.1393107961837;\r
+ Sat, 22 Feb 2014 14:26:01 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91])\r
+ by mx.google.com with ESMTPSA id f45sm43762761eeg.5.2014.02.22.14.26.00\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 22 Feb 2014 14:26:01 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 06/13] test: make it possible to have several corpora\r
+Date: Sun, 23 Feb 2014 00:25:37 +0200\r
+Message-Id:\r
+ <c55b667c47406456b07475fc6d5c5a2ab330341d.1393105055.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
+References: <cover.1393105055.git.jani@nikula.org>\r
+In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
+References: <cover.1393105055.git.jani@nikula.org>\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: Sat, 22 Feb 2014 22:26:25 -0000\r
+\r
+Move the existing corpus under corpus/default, and make it possible to\r
+have multiple corpora under the directory.\r
+---\r
+ test/.gitignore | 2 +-\r
+ test/Makefile.local | 2 +-\r
+ test/T480-hex-escaping.sh | 4 ++--\r
+ test/corpus/{ => default}/cur/01:2, | 0\r
+ test/corpus/{ => default}/cur/02:2, | 0\r
+ test/corpus/{ => default}/cur/03:2, | 0\r
+ test/corpus/{ => default}/cur/04:2, | 0\r
+ test/corpus/{ => default}/cur/05:2, | 0\r
+ test/corpus/{ => default}/cur/06:2, | 0\r
+ test/corpus/{ => default}/cur/07:2, | 0\r
+ test/corpus/{ => default}/cur/08:2, | 0\r
+ test/corpus/{ => default}/cur/09:2, | 0\r
+ test/corpus/{ => default}/cur/10:2, | 0\r
+ test/corpus/{ => default}/cur/11:2, | 0\r
+ test/corpus/{ => default}/cur/12:2, | 0\r
+ test/corpus/{ => default}/cur/13:2, | 0\r
+ test/corpus/{ => default}/cur/14:2, | 0\r
+ test/corpus/{ => default}/cur/15:2, | 0\r
+ test/corpus/{ => default}/cur/16:2, | 0\r
+ test/corpus/{ => default}/cur/17:2, | 0\r
+ test/corpus/{ => default}/cur/18:2, | 0\r
+ test/corpus/{ => default}/cur/19:2, | 0\r
+ test/corpus/{ => default}/cur/20:2, | 0\r
+ test/corpus/{ => default}/cur/21:2, | 0\r
+ test/corpus/{ => default}/cur/22:2, | 0\r
+ test/corpus/{ => default}/cur/23:2, | 0\r
+ test/corpus/{ => default}/cur/24:2, | 0\r
+ test/corpus/{ => default}/cur/25:2, | 0\r
+ test/corpus/{ => default}/cur/26:2, | 0\r
+ test/corpus/{ => default}/cur/27:2, | 0\r
+ test/corpus/{ => default}/cur/28:2, | 0\r
+ test/corpus/{ => default}/cur/29:2, | 0\r
+ test/corpus/{ => default}/cur/30:2, | 0\r
+ test/corpus/{ => default}/cur/31:2, | 0\r
+ test/corpus/{ => default}/cur/32:2, | 0\r
+ test/corpus/{ => default}/cur/33:2, | 0\r
+ test/corpus/{ => default}/cur/34:2, | 0\r
+ test/corpus/{ => default}/cur/35:2, | 0\r
+ test/corpus/{ => default}/cur/36:2, | 0\r
+ test/corpus/{ => default}/cur/37:2, | 0\r
+ test/corpus/{ => default}/cur/38:2, | 0\r
+ test/corpus/{ => default}/cur/39:2, | 0\r
+ test/corpus/{ => default}/cur/40:2, | 0\r
+ test/corpus/{ => default}/cur/41:2, | 0\r
+ test/corpus/{ => default}/cur/42:2, | 0\r
+ test/corpus/{ => default}/cur/43:2, | 0\r
+ test/corpus/{ => default}/cur/44:2, | 0\r
+ test/corpus/{ => default}/cur/45:2, | 0\r
+ test/corpus/{ => default}/cur/46:2, | 0\r
+ test/corpus/{ => default}/cur/47:2, | 0\r
+ test/corpus/{ => default}/cur/48:2, | 0\r
+ test/corpus/{ => default}/cur/49:2, | 0\r
+ test/corpus/{ => default}/cur/50:2, | 0\r
+ test/corpus/{ => default}/cur/51:2, | 0\r
+ test/corpus/{ => default}/cur/52:2, | 0\r
+ test/corpus/{ => default}/cur/53:2, | 0\r
+ test/notmuch-test | 2 +-\r
+ test/test-lib.sh | 21 +++++++++++++--------\r
+ 58 files changed, 18 insertions(+), 13 deletions(-)\r
+ rename test/corpus/{ => default}/cur/01:2, (100%)\r
+ rename test/corpus/{ => default}/cur/02:2, (100%)\r
+ rename test/corpus/{ => default}/cur/03:2, (100%)\r
+ rename test/corpus/{ => default}/cur/04:2, (100%)\r
+ rename test/corpus/{ => default}/cur/05:2, (100%)\r
+ rename test/corpus/{ => default}/cur/06:2, (100%)\r
+ rename test/corpus/{ => default}/cur/07:2, (100%)\r
+ rename test/corpus/{ => default}/cur/08:2, (100%)\r
+ rename test/corpus/{ => default}/cur/09:2, (100%)\r
+ rename test/corpus/{ => default}/cur/10:2, (100%)\r
+ rename test/corpus/{ => default}/cur/11:2, (100%)\r
+ rename test/corpus/{ => default}/cur/12:2, (100%)\r
+ rename test/corpus/{ => default}/cur/13:2, (100%)\r
+ rename test/corpus/{ => default}/cur/14:2, (100%)\r
+ rename test/corpus/{ => default}/cur/15:2, (100%)\r
+ rename test/corpus/{ => default}/cur/16:2, (100%)\r
+ rename test/corpus/{ => default}/cur/17:2, (100%)\r
+ rename test/corpus/{ => default}/cur/18:2, (100%)\r
+ rename test/corpus/{ => default}/cur/19:2, (100%)\r
+ rename test/corpus/{ => default}/cur/20:2, (100%)\r
+ rename test/corpus/{ => default}/cur/21:2, (100%)\r
+ rename test/corpus/{ => default}/cur/22:2, (100%)\r
+ rename test/corpus/{ => default}/cur/23:2, (100%)\r
+ rename test/corpus/{ => default}/cur/24:2, (100%)\r
+ rename test/corpus/{ => default}/cur/25:2, (100%)\r
+ rename test/corpus/{ => default}/cur/26:2, (100%)\r
+ rename test/corpus/{ => default}/cur/27:2, (100%)\r
+ rename test/corpus/{ => default}/cur/28:2, (100%)\r
+ rename test/corpus/{ => default}/cur/29:2, (100%)\r
+ rename test/corpus/{ => default}/cur/30:2, (100%)\r
+ rename test/corpus/{ => default}/cur/31:2, (100%)\r
+ rename test/corpus/{ => default}/cur/32:2, (100%)\r
+ rename test/corpus/{ => default}/cur/33:2, (100%)\r
+ rename test/corpus/{ => default}/cur/34:2, (100%)\r
+ rename test/corpus/{ => default}/cur/35:2, (100%)\r
+ rename test/corpus/{ => default}/cur/36:2, (100%)\r
+ rename test/corpus/{ => default}/cur/37:2, (100%)\r
+ rename test/corpus/{ => default}/cur/38:2, (100%)\r
+ rename test/corpus/{ => default}/cur/39:2, (100%)\r
+ rename test/corpus/{ => default}/cur/40:2, (100%)\r
+ rename test/corpus/{ => default}/cur/41:2, (100%)\r
+ rename test/corpus/{ => default}/cur/42:2, (100%)\r
+ rename test/corpus/{ => default}/cur/43:2, (100%)\r
+ rename test/corpus/{ => default}/cur/44:2, (100%)\r
+ rename test/corpus/{ => default}/cur/45:2, (100%)\r
+ rename test/corpus/{ => default}/cur/46:2, (100%)\r
+ rename test/corpus/{ => default}/cur/47:2, (100%)\r
+ rename test/corpus/{ => default}/cur/48:2, (100%)\r
+ rename test/corpus/{ => default}/cur/49:2, (100%)\r
+ rename test/corpus/{ => default}/cur/50:2, (100%)\r
+ rename test/corpus/{ => default}/cur/51:2, (100%)\r
+ rename test/corpus/{ => default}/cur/52:2, (100%)\r
+ rename test/corpus/{ => default}/cur/53:2, (100%)\r
+\r
+diff --git a/test/.gitignore b/test/.gitignore\r
+index 97e024878728..ed20d1ac6e42 100644\r
+--- a/test/.gitignore\r
++++ b/test/.gitignore\r
+@@ -1,5 +1,5 @@\r
+ test-results\r
+-corpus.mail\r
++corpus.mail.*\r
+ smtp-dummy\r
+ symbol-test\r
+ arg-test\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index 8870ca374848..20f17629dda3 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -57,4 +57,4 @@ CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \\r
+ $(dir)/database-test.o \\r
+ $(dir)/random-corpus $(dir)/random-corpus.o \\r
+ $(dir)/parse-time $(dir)/parse-time.o \\r
+- $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*\r
++ $(dir)/corpus.mail.* $(dir)/test-results $(dir)/tmp.*\r
+diff --git a/test/T480-hex-escaping.sh b/test/T480-hex-escaping.sh\r
+index ad50e1bcc071..15701650df83 100755\r
+--- a/test/T480-hex-escaping.sh\r
++++ b/test/T480-hex-escaping.sh\r
+@@ -3,7 +3,7 @@ test_description="hex encoding and decoding"\r
+ . ./test-lib.sh\r
+ \r
+ test_begin_subtest "round trip"\r
+-find $TEST_DIRECTORY/corpus -type f -print | sort | xargs cat > EXPECTED\r
++find $TEST_DIRECTORY/corpus/default -type f -print | sort | xargs cat > EXPECTED\r
+ $TEST_DIRECTORY/hex-xcode --direction=encode < EXPECTED | $TEST_DIRECTORY/hex-xcode --direction=decode > OUTPUT\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+@@ -25,7 +25,7 @@ $TEST_DIRECTORY/hex-xcode --direction=decode < EXPECTED.$test_count |\\r
+ test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+ \r
+ test_begin_subtest "round trip (in-place)"\r
+-find $TEST_DIRECTORY/corpus -type f -print | sort | xargs cat > EXPECTED\r
++find $TEST_DIRECTORY/corpus/default -type f -print | sort | xargs cat > EXPECTED\r
+ $TEST_DIRECTORY/hex-xcode --in-place --direction=encode < EXPECTED |\\r
+ $TEST_DIRECTORY/hex-xcode --in-place --direction=decode > OUTPUT\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+diff --git a/test/corpus/cur/01:2, b/test/corpus/default/cur/01:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/01:2,\r
+rename to test/corpus/default/cur/01:2,\r
+diff --git a/test/corpus/cur/02:2, b/test/corpus/default/cur/02:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/02:2,\r
+rename to test/corpus/default/cur/02:2,\r
+diff --git a/test/corpus/cur/03:2, b/test/corpus/default/cur/03:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/03:2,\r
+rename to test/corpus/default/cur/03:2,\r
+diff --git a/test/corpus/cur/04:2, b/test/corpus/default/cur/04:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/04:2,\r
+rename to test/corpus/default/cur/04:2,\r
+diff --git a/test/corpus/cur/05:2, b/test/corpus/default/cur/05:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/05:2,\r
+rename to test/corpus/default/cur/05:2,\r
+diff --git a/test/corpus/cur/06:2, b/test/corpus/default/cur/06:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/06:2,\r
+rename to test/corpus/default/cur/06:2,\r
+diff --git a/test/corpus/cur/07:2, b/test/corpus/default/cur/07:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/07:2,\r
+rename to test/corpus/default/cur/07:2,\r
+diff --git a/test/corpus/cur/08:2, b/test/corpus/default/cur/08:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/08:2,\r
+rename to test/corpus/default/cur/08:2,\r
+diff --git a/test/corpus/cur/09:2, b/test/corpus/default/cur/09:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/09:2,\r
+rename to test/corpus/default/cur/09:2,\r
+diff --git a/test/corpus/cur/10:2, b/test/corpus/default/cur/10:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/10:2,\r
+rename to test/corpus/default/cur/10:2,\r
+diff --git a/test/corpus/cur/11:2, b/test/corpus/default/cur/11:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/11:2,\r
+rename to test/corpus/default/cur/11:2,\r
+diff --git a/test/corpus/cur/12:2, b/test/corpus/default/cur/12:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/12:2,\r
+rename to test/corpus/default/cur/12:2,\r
+diff --git a/test/corpus/cur/13:2, b/test/corpus/default/cur/13:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/13:2,\r
+rename to test/corpus/default/cur/13:2,\r
+diff --git a/test/corpus/cur/14:2, b/test/corpus/default/cur/14:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/14:2,\r
+rename to test/corpus/default/cur/14:2,\r
+diff --git a/test/corpus/cur/15:2, b/test/corpus/default/cur/15:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/15:2,\r
+rename to test/corpus/default/cur/15:2,\r
+diff --git a/test/corpus/cur/16:2, b/test/corpus/default/cur/16:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/16:2,\r
+rename to test/corpus/default/cur/16:2,\r
+diff --git a/test/corpus/cur/17:2, b/test/corpus/default/cur/17:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/17:2,\r
+rename to test/corpus/default/cur/17:2,\r
+diff --git a/test/corpus/cur/18:2, b/test/corpus/default/cur/18:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/18:2,\r
+rename to test/corpus/default/cur/18:2,\r
+diff --git a/test/corpus/cur/19:2, b/test/corpus/default/cur/19:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/19:2,\r
+rename to test/corpus/default/cur/19:2,\r
+diff --git a/test/corpus/cur/20:2, b/test/corpus/default/cur/20:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/20:2,\r
+rename to test/corpus/default/cur/20:2,\r
+diff --git a/test/corpus/cur/21:2, b/test/corpus/default/cur/21:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/21:2,\r
+rename to test/corpus/default/cur/21:2,\r
+diff --git a/test/corpus/cur/22:2, b/test/corpus/default/cur/22:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/22:2,\r
+rename to test/corpus/default/cur/22:2,\r
+diff --git a/test/corpus/cur/23:2, b/test/corpus/default/cur/23:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/23:2,\r
+rename to test/corpus/default/cur/23:2,\r
+diff --git a/test/corpus/cur/24:2, b/test/corpus/default/cur/24:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/24:2,\r
+rename to test/corpus/default/cur/24:2,\r
+diff --git a/test/corpus/cur/25:2, b/test/corpus/default/cur/25:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/25:2,\r
+rename to test/corpus/default/cur/25:2,\r
+diff --git a/test/corpus/cur/26:2, b/test/corpus/default/cur/26:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/26:2,\r
+rename to test/corpus/default/cur/26:2,\r
+diff --git a/test/corpus/cur/27:2, b/test/corpus/default/cur/27:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/27:2,\r
+rename to test/corpus/default/cur/27:2,\r
+diff --git a/test/corpus/cur/28:2, b/test/corpus/default/cur/28:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/28:2,\r
+rename to test/corpus/default/cur/28:2,\r
+diff --git a/test/corpus/cur/29:2, b/test/corpus/default/cur/29:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/29:2,\r
+rename to test/corpus/default/cur/29:2,\r
+diff --git a/test/corpus/cur/30:2, b/test/corpus/default/cur/30:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/30:2,\r
+rename to test/corpus/default/cur/30:2,\r
+diff --git a/test/corpus/cur/31:2, b/test/corpus/default/cur/31:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/31:2,\r
+rename to test/corpus/default/cur/31:2,\r
+diff --git a/test/corpus/cur/32:2, b/test/corpus/default/cur/32:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/32:2,\r
+rename to test/corpus/default/cur/32:2,\r
+diff --git a/test/corpus/cur/33:2, b/test/corpus/default/cur/33:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/33:2,\r
+rename to test/corpus/default/cur/33:2,\r
+diff --git a/test/corpus/cur/34:2, b/test/corpus/default/cur/34:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/34:2,\r
+rename to test/corpus/default/cur/34:2,\r
+diff --git a/test/corpus/cur/35:2, b/test/corpus/default/cur/35:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/35:2,\r
+rename to test/corpus/default/cur/35:2,\r
+diff --git a/test/corpus/cur/36:2, b/test/corpus/default/cur/36:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/36:2,\r
+rename to test/corpus/default/cur/36:2,\r
+diff --git a/test/corpus/cur/37:2, b/test/corpus/default/cur/37:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/37:2,\r
+rename to test/corpus/default/cur/37:2,\r
+diff --git a/test/corpus/cur/38:2, b/test/corpus/default/cur/38:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/38:2,\r
+rename to test/corpus/default/cur/38:2,\r
+diff --git a/test/corpus/cur/39:2, b/test/corpus/default/cur/39:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/39:2,\r
+rename to test/corpus/default/cur/39:2,\r
+diff --git a/test/corpus/cur/40:2, b/test/corpus/default/cur/40:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/40:2,\r
+rename to test/corpus/default/cur/40:2,\r
+diff --git a/test/corpus/cur/41:2, b/test/corpus/default/cur/41:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/41:2,\r
+rename to test/corpus/default/cur/41:2,\r
+diff --git a/test/corpus/cur/42:2, b/test/corpus/default/cur/42:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/42:2,\r
+rename to test/corpus/default/cur/42:2,\r
+diff --git a/test/corpus/cur/43:2, b/test/corpus/default/cur/43:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/43:2,\r
+rename to test/corpus/default/cur/43:2,\r
+diff --git a/test/corpus/cur/44:2, b/test/corpus/default/cur/44:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/44:2,\r
+rename to test/corpus/default/cur/44:2,\r
+diff --git a/test/corpus/cur/45:2, b/test/corpus/default/cur/45:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/45:2,\r
+rename to test/corpus/default/cur/45:2,\r
+diff --git a/test/corpus/cur/46:2, b/test/corpus/default/cur/46:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/46:2,\r
+rename to test/corpus/default/cur/46:2,\r
+diff --git a/test/corpus/cur/47:2, b/test/corpus/default/cur/47:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/47:2,\r
+rename to test/corpus/default/cur/47:2,\r
+diff --git a/test/corpus/cur/48:2, b/test/corpus/default/cur/48:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/48:2,\r
+rename to test/corpus/default/cur/48:2,\r
+diff --git a/test/corpus/cur/49:2, b/test/corpus/default/cur/49:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/49:2,\r
+rename to test/corpus/default/cur/49:2,\r
+diff --git a/test/corpus/cur/50:2, b/test/corpus/default/cur/50:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/50:2,\r
+rename to test/corpus/default/cur/50:2,\r
+diff --git a/test/corpus/cur/51:2, b/test/corpus/default/cur/51:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/51:2,\r
+rename to test/corpus/default/cur/51:2,\r
+diff --git a/test/corpus/cur/52:2, b/test/corpus/default/cur/52:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/52:2,\r
+rename to test/corpus/default/cur/52:2,\r
+diff --git a/test/corpus/cur/53:2, b/test/corpus/default/cur/53:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/53:2,\r
+rename to test/corpus/default/cur/53:2,\r
+diff --git a/test/notmuch-test b/test/notmuch-test\r
+index b8437127c01f..6598f428d14f 100755\r
+--- a/test/notmuch-test\r
++++ b/test/notmuch-test\r
+@@ -49,6 +49,6 @@ echo\r
+ ev=$?\r
+ \r
+ # Clean up\r
+-rm -rf test-results corpus.mail\r
++rm -rf test-results corpus.mail.*\r
+ \r
+ exit $ev\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 78af170fe739..69070f26e4fe 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -516,19 +516,24 @@ emacs_fcc_message ()\r
+ \r
+ # Generate a corpus of email and add it to the database.\r
+ #\r
+-# This corpus is fixed, (it happens to be 50 messages from early in\r
+-# the history of the notmuch mailing list), which allows for reliably\r
+-# testing commands that need to operate on a not-totally-trivial\r
+-# number of messages.\r
++# The first parameter defines the corpus to pick under the corpus\r
++# directory, defaulting to "default".\r
++#\r
++# The default corpus is fixed, (it happens to be 50 messages from\r
++# early in the history of the notmuch mailing list), which allows for\r
++# reliably testing commands that need to operate on a\r
++# not-totally-trivial number of messages.\r
+ add_email_corpus ()\r
+ {\r
++ local corpus=${1:-default}\r
++\r
+ rm -rf ${MAIL_DIR}\r
+- if [ -d $TEST_DIRECTORY/corpus.mail ]; then\r
+- cp -a $TEST_DIRECTORY/corpus.mail ${MAIL_DIR}\r
++ if [ -d $TEST_DIRECTORY/corpus.mail.${corpus} ]; then\r
++ cp -a $TEST_DIRECTORY/corpus.mail.${corpus} ${MAIL_DIR}\r
+ else\r
+- cp -a $TEST_DIRECTORY/corpus ${MAIL_DIR}\r
++ cp -a $TEST_DIRECTORY/corpus/${corpus} ${MAIL_DIR}\r
+ notmuch new >/dev/null\r
+- cp -a ${MAIL_DIR} $TEST_DIRECTORY/corpus.mail\r
++ cp -a ${MAIL_DIR} $TEST_DIRECTORY/corpus.mail.${corpus}\r
+ fi\r
+ }\r
+ \r
+-- \r
+1.8.5.3\r
+\r
projects / notmuch-archives.git / commitdiff