From 81b2ad57f06f6b7619aae81dc2a0b79ec426ca73 Mon Sep 17 00:00:00 2001
From: Mark Walters <markwalters1009@gmail.com>
Date: Tue, 29 Oct 2013 22:55:32 +0000
Subject: [PATCH] test: move emacs-tree test into mainline

We move the emacs-tree test and associated files into the main test
directory and add the test to the list in notmuch-test.
---
 {contrib/notmuch-pick/test => test}/emacs-tree                   | 0
 test/notmuch-test                                                | 1 +
 .../test => test}/tree.expected-output/notmuch-tree-show-window  | 0
 .../tree.expected-output/notmuch-tree-single-thread              | 0
 .../test => test}/tree.expected-output/notmuch-tree-tag-inbox    | 0
 .../tree.expected-output/notmuch-tree-tag-inbox-tagged           | 0
 .../tree.expected-output/notmuch-tree-tag-inbox-thread-tagged    | 0
 7 files changed, 1 insertion(+)
 rename {contrib/notmuch-pick/test => test}/emacs-tree (100%)
 rename {contrib/notmuch-pick/test => test}/tree.expected-output/notmuch-tree-show-window (100%)
 rename {contrib/notmuch-pick/test => test}/tree.expected-output/notmuch-tree-single-thread (100%)
 rename {contrib/notmuch-pick/test => test}/tree.expected-output/notmuch-tree-tag-inbox (100%)
 rename {contrib/notmuch-pick/test => test}/tree.expected-output/notmuch-tree-tag-inbox-tagged (100%)
 rename {contrib/notmuch-pick/test => test}/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged (100%)

diff --git a/contrib/notmuch-pick/test/emacs-tree b/test/emacs-tree
similarity index 100%
rename from contrib/notmuch-pick/test/emacs-tree
rename to test/emacs-tree
diff --git a/test/notmuch-test b/test/notmuch-test
index ec94baf3..18593f61 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -63,6 +63,7 @@ TESTS="
   emacs-address-cleaning
   emacs-hello
   emacs-show
+  emacs-tree
   missing-headers
   hex-escaping
   parse-time-string
diff --git a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window b/test/tree.expected-output/notmuch-tree-show-window
similarity index 100%
rename from contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window
rename to test/tree.expected-output/notmuch-tree-show-window
diff --git a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread b/test/tree.expected-output/notmuch-tree-single-thread
similarity index 100%
rename from contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread
rename to test/tree.expected-output/notmuch-tree-single-thread
diff --git a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox b/test/tree.expected-output/notmuch-tree-tag-inbox
similarity index 100%
rename from contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox
rename to test/tree.expected-output/notmuch-tree-tag-inbox
diff --git a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged b/test/tree.expected-output/notmuch-tree-tag-inbox-tagged
similarity index 100%
rename from contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged
rename to test/tree.expected-output/notmuch-tree-tag-inbox-tagged
diff --git a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged b/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged
similarity index 100%
rename from contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged
rename to test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged