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.

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 ec94baf3660520e21d1e7a0ca2dbc031499a886a..18593f61d23b14d8386e901eeaeec3b5305fc944 100755 (executable)
--- 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