[PATCH] test: Make it easier to resolve conflicts when adding new tests

[PATCH] test: Make it easier to resolve conflicts when adding new tests

[Michal Sojka]

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.
---
 test/basic        |    9 +++++++--
 test/notmuch-test |   21 ++++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/test/basic b/test/basic
index e1269e2..3b43ad9 100755
--- a/test/basic
+++ b/test/basic
@@ -51,8 +51,13 @@ test_expect_code 2 'failure to clean up causes the test to fail' '
 
 # Ensure that all tests are being run
 test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'
-tests_in_suite=$(grep TESTS= ../notmuch-test | sed -e "s/TESTS=\"\(.*\)\"/\1/" | tr " " "\n" | sort)
-available=$(ls -1 ../ | grep -v -E "^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test|README|test-lib.sh|test-results|tmp.*|valgrind|corpus*|emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|test.expected-output|.*~)" | sort)
+eval $(sed -n -e '/^TESTS="$/,/^"$/p' notmuch-test ../notmuch-test)
+tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
+available=$(ls -1 ../ | \
+    sed -r -e "/^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test)/d" \
+	   -e "/^(README|test-lib.sh|test-results|tmp.*|valgrind|corpus*)/d" \
+	   -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose)/d" \
+	   -e "/^(test.expected-output|.*~)/d" | sort)
 test_expect_equal "$tests_in_suite" "$available"
 
 EXPECTED=../test.expected-output
diff --git a/test/notmuch-test b/test/notmuch-test
index fcf43a8..1e5ac11 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -16,7 +16,26 @@ fi
 
 cd $(dirname "$0")
 
-TESTS="basic new search search-output search-by-folder 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
+  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
-- 
1.7.2.3

Re: [PATCH] test: Make it easier to resolve conflicts when adding new tests

[Carl Worth]

[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

On Sun, 23 Jan 2011 12:12:24 +0100, Michal Sojka <sojkam1@fel.cvut.cz> wrote:
> 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.

Thanks. That will be right handy. Committed.

-Carl

-- 
carl.d.worth@intel.com

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]