[PATCH v4 01/13] test: rearrange the test corpus into subfolders
authorJani Nikula <jani@nikula.org>
Sun, 9 Mar 2014 21:40:22 +0000 (23:40 +0200)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:00:31 +0000 (10:00 -0800)
2e/d572dede3dcdd1f0baa3ce2ef3def0f484413d [new file with mode: 0644]

diff --git a/2e/d572dede3dcdd1f0baa3ce2ef3def0f484413d b/2e/d572dede3dcdd1f0baa3ce2ef3def0f484413d
new file mode 100644 (file)
index 0000000..a42e68c
--- /dev/null
@@ -0,0 +1,444 @@
+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 37545431FC2\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 14:40:47 -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 2AtOgwLJlP+G for <notmuch@notmuchmail.org>;\r
+       Sun,  9 Mar 2014 14:40:42 -0700 (PDT)\r
+Received: from mail-la0-f42.google.com (mail-la0-f42.google.com\r
+       [209.85.215.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9E47B431FBD\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 14:40:41 -0700 (PDT)\r
+Received: by mail-la0-f42.google.com with SMTP id ec20so4201553lab.1\r
+       for <notmuch@notmuchmail.org>; Sun, 09 Mar 2014 14:40:40 -0700 (PDT)\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=ta2ffAs5HnGDoQ0uqyqxjsj2mGmNBDbUUGjaWvsNuws=;\r
+       b=PEz34W2PYu52oxVUDwr87abpcn9oiSS5xoop18eBB3RjuSg1zJhq0gaCGA0mJcYOQn\r
+       ZE5b1NNXmxBxXnw4vxAIIe7Ynvw3agyFNZbk3Qu/KIN4c5qKr5IkwOCOADRgSseFxUMh\r
+       Zv+A7TlispUD8LgWvgDOoNOeU50VqeamIocK4yKRdHJ8a/459WD88vfEBSs/m5OnX0o9\r
+       KOkCqEkKP92kz6SqKi4m2uzHqTcaFrqoerwBhO4EKCfGUvgZtOstI8cfuoWMfythYj0u\r
+       aqNXzBVgbZ3T0oJnmhWNy27ylkcdZ3ayh9GH2+Khm6oMve2vkhL+zVhSX/Y5xt+EU6gM\r
+       VWfQ==\r
+X-Gm-Message-State:\r
+ ALoCoQkiLq3Fi2k3Z1T5Oii/VvwGuhgXaCGM/tIQ6zNcnHtp+LswOyOVlwa+J2DcF/eOYrnbJsOC\r
+X-Received: by 10.152.6.199 with SMTP id d7mr21271797laa.22.1394401240144;\r
+       Sun, 09 Mar 2014 14:40:40 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id q4sm19397147lbl.14.2014.03.09.14.40.38\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 09 Mar 2014 14:40:39 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 01/13] test: rearrange the test corpus into subfolders\r
+Date: Sun,  9 Mar 2014 23:40:22 +0200\r
+Message-Id:\r
+ <aa121361c0ad354f2c6d45b776299a0ba59b6844.1394400503.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.9.0\r
+In-Reply-To: <cover.1394400503.git.jani@nikula.org>\r
+References: <cover.1394400503.git.jani@nikula.org>\r
+In-Reply-To: <cover.1394400503.git.jani@nikula.org>\r
+References: <cover.1394400503.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: Sun, 09 Mar 2014 21:40:47 -0000\r
+\r
+We will need this for improved folder search tests, but having some\r
+folders should exercise our code paths better anyway.\r
+\r
+Modify the relevant test accordingly to make it pass.\r
+---\r
+ test/T090-search-output.sh             | 168 ++++++++++++++++-----------------\r
+ test/corpus/{cur => }/01:2,            |   0\r
+ test/corpus/{cur => }/02:2,            |   0\r
+ test/corpus/{cur => bar}/17:2,         |   0\r
+ test/corpus/{cur => bar}/18:2,         |   0\r
+ test/corpus/{cur => bar/baz}/05:2,     |   0\r
+ test/corpus/{cur => bar/baz}/23:2,     |   0\r
+ test/corpus/{cur => bar/baz}/24:2,     |   0\r
+ test/corpus/{ => bar/baz}/cur/25:2,    |   0\r
+ test/corpus/{ => bar/baz}/cur/26:2,    |   0\r
+ test/corpus/{cur => bar/baz/new}/27:2, |   0\r
+ test/corpus/{cur => bar/baz/new}/28:2, |   0\r
+ test/corpus/{ => bar}/cur/19:2,        |   0\r
+ test/corpus/{ => bar}/cur/20:2,        |   0\r
+ test/corpus/{cur => bar/new}/21:2,     |   0\r
+ test/corpus/{cur => bar/new}/22:2,     |   0\r
+ test/corpus/{cur => foo}/06:2,         |   0\r
+ test/corpus/{cur => foo/baz}/11:2,     |   0\r
+ test/corpus/{cur => foo/baz}/12:2,     |   0\r
+ test/corpus/{ => foo/baz}/cur/13:2,    |   0\r
+ test/corpus/{ => foo/baz}/cur/14:2,    |   0\r
+ test/corpus/{cur => foo/baz/new}/15:2, |   0\r
+ test/corpus/{cur => foo/baz/new}/16:2, |   0\r
+ test/corpus/{ => foo}/cur/07:2,        |   0\r
+ test/corpus/{ => foo}/cur/08:2,        |   0\r
+ test/corpus/{cur => foo/new}/03:2,     |   0\r
+ test/corpus/{cur => foo/new}/09:2,     |   0\r
+ test/corpus/{cur => foo/new}/10:2,     |   0\r
+ test/corpus/{cur => new}/04:2,         |   0\r
+ 29 files changed, 84 insertions(+), 84 deletions(-)\r
+ rename test/corpus/{cur => }/01:2, (100%)\r
+ rename test/corpus/{cur => }/02:2, (100%)\r
+ rename test/corpus/{cur => bar}/17:2, (100%)\r
+ rename test/corpus/{cur => bar}/18:2, (100%)\r
+ rename test/corpus/{cur => bar/baz}/05:2, (100%)\r
+ rename test/corpus/{cur => bar/baz}/23:2, (100%)\r
+ rename test/corpus/{cur => bar/baz}/24:2, (100%)\r
+ rename test/corpus/{ => bar/baz}/cur/25:2, (100%)\r
+ rename test/corpus/{ => bar/baz}/cur/26:2, (100%)\r
+ rename test/corpus/{cur => bar/baz/new}/27:2, (100%)\r
+ rename test/corpus/{cur => bar/baz/new}/28:2, (100%)\r
+ rename test/corpus/{ => bar}/cur/19:2, (100%)\r
+ rename test/corpus/{ => bar}/cur/20:2, (100%)\r
+ rename test/corpus/{cur => bar/new}/21:2, (100%)\r
+ rename test/corpus/{cur => bar/new}/22:2, (100%)\r
+ rename test/corpus/{cur => foo}/06:2, (100%)\r
+ rename test/corpus/{cur => foo/baz}/11:2, (100%)\r
+ rename test/corpus/{cur => foo/baz}/12:2, (100%)\r
+ rename test/corpus/{ => foo/baz}/cur/13:2, (100%)\r
+ rename test/corpus/{ => foo/baz}/cur/14:2, (100%)\r
+ rename test/corpus/{cur => foo/baz/new}/15:2, (100%)\r
+ rename test/corpus/{cur => foo/baz/new}/16:2, (100%)\r
+ rename test/corpus/{ => foo}/cur/07:2, (100%)\r
+ rename test/corpus/{ => foo}/cur/08:2, (100%)\r
+ rename test/corpus/{cur => foo/new}/03:2, (100%)\r
+ rename test/corpus/{cur => foo/new}/09:2, (100%)\r
+ rename test/corpus/{cur => foo/new}/10:2, (100%)\r
+ rename test/corpus/{cur => new}/04:2, (100%)\r
+\r
+diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh\r
+index 86544ac956a1..ef28c3d157aa 100755\r
+--- a/test/T090-search-output.sh\r
++++ b/test/T090-search-output.sh\r
+@@ -207,35 +207,35 @@ MAIL_DIR/cur/32:2,\r
+ MAIL_DIR/cur/31:2,\r
+ MAIL_DIR/cur/30:2,\r
+ MAIL_DIR/cur/29:2,\r
+-MAIL_DIR/cur/28:2,\r
+-MAIL_DIR/cur/27:2,\r
+-MAIL_DIR/cur/26:2,\r
+-MAIL_DIR/cur/25:2,\r
+-MAIL_DIR/cur/24:2,\r
+-MAIL_DIR/cur/23:2,\r
+-MAIL_DIR/cur/22:2,\r
+-MAIL_DIR/cur/21:2,\r
+-MAIL_DIR/cur/19:2,\r
+-MAIL_DIR/cur/18:2,\r
++MAIL_DIR/bar/baz/new/28:2,\r
++MAIL_DIR/bar/baz/new/27:2,\r
++MAIL_DIR/bar/baz/cur/26:2,\r
++MAIL_DIR/bar/baz/cur/25:2,\r
++MAIL_DIR/bar/baz/24:2,\r
++MAIL_DIR/bar/baz/23:2,\r
++MAIL_DIR/bar/new/22:2,\r
++MAIL_DIR/bar/new/21:2,\r
++MAIL_DIR/bar/cur/19:2,\r
++MAIL_DIR/bar/18:2,\r
+ MAIL_DIR/cur/51:2,\r
+-MAIL_DIR/cur/20:2,\r
+-MAIL_DIR/cur/17:2,\r
+-MAIL_DIR/cur/16:2,\r
+-MAIL_DIR/cur/15:2,\r
+-MAIL_DIR/cur/14:2,\r
+-MAIL_DIR/cur/13:2,\r
+-MAIL_DIR/cur/12:2,\r
+-MAIL_DIR/cur/11:2,\r
+-MAIL_DIR/cur/10:2,\r
+-MAIL_DIR/cur/09:2,\r
+-MAIL_DIR/cur/08:2,\r
+-MAIL_DIR/cur/06:2,\r
+-MAIL_DIR/cur/05:2,\r
+-MAIL_DIR/cur/04:2,\r
+-MAIL_DIR/cur/03:2,\r
+-MAIL_DIR/cur/07:2,\r
+-MAIL_DIR/cur/02:2,\r
+-MAIL_DIR/cur/01:2,\r
++MAIL_DIR/bar/cur/20:2,\r
++MAIL_DIR/bar/17:2,\r
++MAIL_DIR/foo/baz/new/16:2,\r
++MAIL_DIR/foo/baz/new/15:2,\r
++MAIL_DIR/foo/baz/cur/14:2,\r
++MAIL_DIR/foo/baz/cur/13:2,\r
++MAIL_DIR/foo/baz/12:2,\r
++MAIL_DIR/foo/baz/11:2,\r
++MAIL_DIR/foo/new/10:2,\r
++MAIL_DIR/foo/new/09:2,\r
++MAIL_DIR/foo/cur/08:2,\r
++MAIL_DIR/foo/06:2,\r
++MAIL_DIR/bar/baz/05:2,\r
++MAIL_DIR/new/04:2,\r
++MAIL_DIR/foo/new/03:2,\r
++MAIL_DIR/foo/cur/07:2,\r
++MAIL_DIR/02:2,\r
++MAIL_DIR/01:2,\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
\r
+@@ -266,34 +266,34 @@ MAIL_DIR/cur/32:2,\r
+ MAIL_DIR/cur/31:2,\r
+ MAIL_DIR/cur/30:2,\r
+ MAIL_DIR/cur/29:2,\r
+-MAIL_DIR/cur/28:2,\r
+-MAIL_DIR/cur/27:2,\r
+-MAIL_DIR/cur/26:2,\r
+-MAIL_DIR/cur/25:2,\r
+-MAIL_DIR/cur/24:2,\r
+-MAIL_DIR/cur/23:2,\r
+-MAIL_DIR/cur/22:2,\r
+-MAIL_DIR/cur/21:2,\r
+-MAIL_DIR/cur/19:2,\r
+-MAIL_DIR/cur/18:2,\r
+-MAIL_DIR/cur/20:2,\r
+-MAIL_DIR/cur/17:2,\r
+-MAIL_DIR/cur/16:2,\r
+-MAIL_DIR/cur/15:2,\r
+-MAIL_DIR/cur/14:2,\r
+-MAIL_DIR/cur/13:2,\r
+-MAIL_DIR/cur/12:2,\r
+-MAIL_DIR/cur/11:2,\r
+-MAIL_DIR/cur/10:2,\r
+-MAIL_DIR/cur/09:2,\r
+-MAIL_DIR/cur/08:2,\r
+-MAIL_DIR/cur/06:2,\r
+-MAIL_DIR/cur/05:2,\r
+-MAIL_DIR/cur/04:2,\r
+-MAIL_DIR/cur/03:2,\r
+-MAIL_DIR/cur/07:2,\r
+-MAIL_DIR/cur/02:2,\r
+-MAIL_DIR/cur/01:2,\r
++MAIL_DIR/bar/baz/new/28:2,\r
++MAIL_DIR/bar/baz/new/27:2,\r
++MAIL_DIR/bar/baz/cur/26:2,\r
++MAIL_DIR/bar/baz/cur/25:2,\r
++MAIL_DIR/bar/baz/24:2,\r
++MAIL_DIR/bar/baz/23:2,\r
++MAIL_DIR/bar/new/22:2,\r
++MAIL_DIR/bar/new/21:2,\r
++MAIL_DIR/bar/cur/19:2,\r
++MAIL_DIR/bar/18:2,\r
++MAIL_DIR/bar/cur/20:2,\r
++MAIL_DIR/bar/17:2,\r
++MAIL_DIR/foo/baz/new/16:2,\r
++MAIL_DIR/foo/baz/new/15:2,\r
++MAIL_DIR/foo/baz/cur/14:2,\r
++MAIL_DIR/foo/baz/cur/13:2,\r
++MAIL_DIR/foo/baz/12:2,\r
++MAIL_DIR/foo/baz/11:2,\r
++MAIL_DIR/foo/new/10:2,\r
++MAIL_DIR/foo/new/09:2,\r
++MAIL_DIR/foo/cur/08:2,\r
++MAIL_DIR/foo/06:2,\r
++MAIL_DIR/bar/baz/05:2,\r
++MAIL_DIR/new/04:2,\r
++MAIL_DIR/foo/new/03:2,\r
++MAIL_DIR/foo/cur/07:2,\r
++MAIL_DIR/02:2,\r
++MAIL_DIR/01:2,\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
\r
+@@ -324,35 +324,35 @@ cat <<EOF >EXPECTED\r
+ "MAIL_DIR/cur/31:2,",\r
+ "MAIL_DIR/cur/30:2,",\r
+ "MAIL_DIR/cur/29:2,",\r
+-"MAIL_DIR/cur/28:2,",\r
+-"MAIL_DIR/cur/27:2,",\r
+-"MAIL_DIR/cur/26:2,",\r
+-"MAIL_DIR/cur/25:2,",\r
+-"MAIL_DIR/cur/24:2,",\r
+-"MAIL_DIR/cur/23:2,",\r
+-"MAIL_DIR/cur/22:2,",\r
+-"MAIL_DIR/cur/21:2,",\r
+-"MAIL_DIR/cur/19:2,",\r
+-"MAIL_DIR/cur/18:2,",\r
++"MAIL_DIR/bar/baz/new/28:2,",\r
++"MAIL_DIR/bar/baz/new/27:2,",\r
++"MAIL_DIR/bar/baz/cur/26:2,",\r
++"MAIL_DIR/bar/baz/cur/25:2,",\r
++"MAIL_DIR/bar/baz/24:2,",\r
++"MAIL_DIR/bar/baz/23:2,",\r
++"MAIL_DIR/bar/new/22:2,",\r
++"MAIL_DIR/bar/new/21:2,",\r
++"MAIL_DIR/bar/cur/19:2,",\r
++"MAIL_DIR/bar/18:2,",\r
+ "MAIL_DIR/cur/51:2,",\r
+-"MAIL_DIR/cur/20:2,",\r
+-"MAIL_DIR/cur/17:2,",\r
+-"MAIL_DIR/cur/16:2,",\r
+-"MAIL_DIR/cur/15:2,",\r
+-"MAIL_DIR/cur/14:2,",\r
+-"MAIL_DIR/cur/13:2,",\r
+-"MAIL_DIR/cur/12:2,",\r
+-"MAIL_DIR/cur/11:2,",\r
+-"MAIL_DIR/cur/10:2,",\r
+-"MAIL_DIR/cur/09:2,",\r
+-"MAIL_DIR/cur/08:2,",\r
+-"MAIL_DIR/cur/06:2,",\r
+-"MAIL_DIR/cur/05:2,",\r
+-"MAIL_DIR/cur/04:2,",\r
+-"MAIL_DIR/cur/03:2,",\r
+-"MAIL_DIR/cur/07:2,",\r
+-"MAIL_DIR/cur/02:2,",\r
+-"MAIL_DIR/cur/01:2,"]\r
++"MAIL_DIR/bar/cur/20:2,",\r
++"MAIL_DIR/bar/17:2,",\r
++"MAIL_DIR/foo/baz/new/16:2,",\r
++"MAIL_DIR/foo/baz/new/15:2,",\r
++"MAIL_DIR/foo/baz/cur/14:2,",\r
++"MAIL_DIR/foo/baz/cur/13:2,",\r
++"MAIL_DIR/foo/baz/12:2,",\r
++"MAIL_DIR/foo/baz/11:2,",\r
++"MAIL_DIR/foo/new/10:2,",\r
++"MAIL_DIR/foo/new/09:2,",\r
++"MAIL_DIR/foo/cur/08:2,",\r
++"MAIL_DIR/foo/06:2,",\r
++"MAIL_DIR/bar/baz/05:2,",\r
++"MAIL_DIR/new/04:2,",\r
++"MAIL_DIR/foo/new/03:2,",\r
++"MAIL_DIR/foo/cur/07:2,",\r
++"MAIL_DIR/02:2,",\r
++"MAIL_DIR/01:2,"]\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
\r
+diff --git a/test/corpus/cur/01:2, b/test/corpus/01:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/01:2,\r
+rename to test/corpus/01:2,\r
+diff --git a/test/corpus/cur/02:2, b/test/corpus/02:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/02:2,\r
+rename to test/corpus/02:2,\r
+diff --git a/test/corpus/cur/17:2, b/test/corpus/bar/17:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/17:2,\r
+rename to test/corpus/bar/17:2,\r
+diff --git a/test/corpus/cur/18:2, b/test/corpus/bar/18:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/18:2,\r
+rename to test/corpus/bar/18:2,\r
+diff --git a/test/corpus/cur/05:2, b/test/corpus/bar/baz/05:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/05:2,\r
+rename to test/corpus/bar/baz/05:2,\r
+diff --git a/test/corpus/cur/23:2, b/test/corpus/bar/baz/23:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/23:2,\r
+rename to test/corpus/bar/baz/23:2,\r
+diff --git a/test/corpus/cur/24:2, b/test/corpus/bar/baz/24:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/24:2,\r
+rename to test/corpus/bar/baz/24:2,\r
+diff --git a/test/corpus/cur/25:2, b/test/corpus/bar/baz/cur/25:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/25:2,\r
+rename to test/corpus/bar/baz/cur/25:2,\r
+diff --git a/test/corpus/cur/26:2, b/test/corpus/bar/baz/cur/26:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/26:2,\r
+rename to test/corpus/bar/baz/cur/26:2,\r
+diff --git a/test/corpus/cur/27:2, b/test/corpus/bar/baz/new/27:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/27:2,\r
+rename to test/corpus/bar/baz/new/27:2,\r
+diff --git a/test/corpus/cur/28:2, b/test/corpus/bar/baz/new/28:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/28:2,\r
+rename to test/corpus/bar/baz/new/28:2,\r
+diff --git a/test/corpus/cur/19:2, b/test/corpus/bar/cur/19:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/19:2,\r
+rename to test/corpus/bar/cur/19:2,\r
+diff --git a/test/corpus/cur/20:2, b/test/corpus/bar/cur/20:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/20:2,\r
+rename to test/corpus/bar/cur/20:2,\r
+diff --git a/test/corpus/cur/21:2, b/test/corpus/bar/new/21:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/21:2,\r
+rename to test/corpus/bar/new/21:2,\r
+diff --git a/test/corpus/cur/22:2, b/test/corpus/bar/new/22:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/22:2,\r
+rename to test/corpus/bar/new/22:2,\r
+diff --git a/test/corpus/cur/06:2, b/test/corpus/foo/06:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/06:2,\r
+rename to test/corpus/foo/06:2,\r
+diff --git a/test/corpus/cur/11:2, b/test/corpus/foo/baz/11:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/11:2,\r
+rename to test/corpus/foo/baz/11:2,\r
+diff --git a/test/corpus/cur/12:2, b/test/corpus/foo/baz/12:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/12:2,\r
+rename to test/corpus/foo/baz/12:2,\r
+diff --git a/test/corpus/cur/13:2, b/test/corpus/foo/baz/cur/13:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/13:2,\r
+rename to test/corpus/foo/baz/cur/13:2,\r
+diff --git a/test/corpus/cur/14:2, b/test/corpus/foo/baz/cur/14:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/14:2,\r
+rename to test/corpus/foo/baz/cur/14:2,\r
+diff --git a/test/corpus/cur/15:2, b/test/corpus/foo/baz/new/15:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/15:2,\r
+rename to test/corpus/foo/baz/new/15:2,\r
+diff --git a/test/corpus/cur/16:2, b/test/corpus/foo/baz/new/16:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/16:2,\r
+rename to test/corpus/foo/baz/new/16:2,\r
+diff --git a/test/corpus/cur/07:2, b/test/corpus/foo/cur/07:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/07:2,\r
+rename to test/corpus/foo/cur/07:2,\r
+diff --git a/test/corpus/cur/08:2, b/test/corpus/foo/cur/08:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/08:2,\r
+rename to test/corpus/foo/cur/08:2,\r
+diff --git a/test/corpus/cur/03:2, b/test/corpus/foo/new/03:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/03:2,\r
+rename to test/corpus/foo/new/03:2,\r
+diff --git a/test/corpus/cur/09:2, b/test/corpus/foo/new/09:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/09:2,\r
+rename to test/corpus/foo/new/09:2,\r
+diff --git a/test/corpus/cur/10:2, b/test/corpus/foo/new/10:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/10:2,\r
+rename to test/corpus/foo/new/10:2,\r
+diff --git a/test/corpus/cur/04:2, b/test/corpus/new/04:2,\r
+similarity index 100%\r
+rename from test/corpus/cur/04:2,\r
+rename to test/corpus/new/04:2,\r
+-- \r
+1.9.0\r
+\r