aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/notmuch-test
diff options
context:
space:
mode:
authorGravatar Michal Sojka <sojkam1@fel.cvut.cz>2011-01-23 12:12:24 +0100
committerGravatar Carl Worth <cworth@cworth.org>2011-01-26 22:37:21 +1000
commitcb6411e29135217aaf4abb0615a8ca730c5f2bc2 (patch)
treed33046a934756b97c256732f20eb78160f860de2 /test/notmuch-test
parentf806dd3a8f298bdb03bc22b2f8d3236ee7b884a0 (diff)
test: Make it easier to resolve conflicts when adding new tests
Currently, there are two places in the test framework that contain very long list on a single line. Whenever a test is added (or changed) in several branches and these branches are merged, it results in conflict which is hard to resolve because one has to go through the whole long line to find where the conflict is. This patch splits these long lists to several lines so that the conflicts are easier to resolve.
Diffstat (limited to 'test/notmuch-test')
-rwxr-xr-xtest/notmuch-test22
1 files changed, 21 insertions, 1 deletions
diff --git a/test/notmuch-test b/test/notmuch-test
index b2bfdff0..9d77c0fa 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -16,7 +16,27 @@ fi
cd $(dirname "$0")
-TESTS="basic new search search-output search-by-folder search-position-overlap-bug json thread-naming raw reply dump-restore uuencode thread-order author-order from-guessing long-id encoding emacs maildir-sync"
+TESTS="
+ basic
+ new
+ search
+ search-output
+ search-by-folder
+ search-position-overlap-bug
+ json
+ thread-naming
+ raw
+ reply
+ dump-restore
+ uuencode
+ thread-order
+ author-order
+ from-guessing
+ long-id
+ encoding
+ emacs
+ maildir-sync
+"
# Clean up any results from a previous run
rm -r test-results >/dev/null 2>/dev/null