diff options
| author |  Jani Nikula <jani@nikula.org> | 2014-03-09 14:25:37 +0200 |
|---|---|---|
| committer |  David Bremner <david@tethera.net> | 2014-03-11 19:50:12 -0300 |
| commit | ded713c39d8b0221a3b1b2b52a74966c20c3aba8 (patch) | |
| tree | 018da27a979738c09760b5fbbda3253cc5ff998f /test/corpus/foo/baz/cur/14:2, | |
| parent | 7630f300ba52f4aab22ee696fe1507d0ef9790bc (diff) | |
test: rearrange the test corpus into subfolders, fix tests
We will need this for improved folder search tests, but having some
folders should exercise our code paths better anyway.
Modify the relevant test accordingly to make it pass.
This reorganization triggers a bug in the test suite, namely that it
expects the output of --output=files to be in a certain order. So we
add the fix for that into the same commit.
This mainly involves sorting, although the case --duplicate=$n
requires more subtlety.
Diffstat (limited to 'test/corpus/foo/baz/cur/14:2,')
| -rw-r--r-- | test/corpus/foo/baz/cur/14:2, | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/test/corpus/foo/baz/cur/14:2, b/test/corpus/foo/baz/cur/14:2, new file mode 100644 index 00000000..d3fe78db --- /dev/null +++ b/test/corpus/foo/baz/cur/14:2, @@ -0,0 +1,39 @@ +From: "Jan Janak" <jan@ryngle.com> +To: notmuch@notmuchmail.org +Date: Tue, 17 Nov 2009 23:18:47 +0100 +Subject: [notmuch] [PATCH] Older versions of install do not support -C. +Message-ID: <1258496327-12086-1-git-send-email-jan@ryngle.com> + +Do not use -C cmdline option of install, older versions, commonly found in +distributions like Debian, do not seem to support it. Running make install +on such systems (tested on Debian Lenny) fails. + +Signed-off-by: Jan Janak <jan at ryngle.com> +--- + Makefile.local | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.local b/Makefile.local +index f824bed..f51f1d1 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -27,11 +27,11 @@ install: all notmuch.1.gz + for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \ + $(DESTDIR)/etc/bash_completion.d/ ; \ + do \ +- install -C -d $$d ; \ ++ install -d $$d ; \ + done ; +- install -C notmuch $(DESTDIR)$(prefix)/bin/ +- install -C -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ +- install -C notmuch-completion.bash \ ++ install notmuch $(DESTDIR)$(prefix)/bin/ ++ install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ ++ install notmuch-completion.bash \ + $(DESTDIR)/etc/bash_completion.d/notmuch + + SRCS := $(SRCS) $(notmuch_client_srcs) +-- +1.6.3.3 + + |