date:20131031

[PATCH 1/4] test: Add compact test

2013-10-31 Thread Tomi Ollila

On Thu, Oct 31 2013, Ben Gamari  wrote:

> Signed-off-by: Ben Gamari 

LGTM.

Tomi


> ---
>  test/compact  | 32 
>  test/notmuch-test |  1 +
>  2 files changed, 33 insertions(+)
>  create mode 100755 test/compact
>
> diff --git a/test/compact b/test/compact
> new file mode 100755
> index 000..5bb5cea
> --- /dev/null
> +++ b/test/compact
> @@ -0,0 +1,32 @@
> +#!/usr/bin/env bash
> +test_description='"notmuch compact"'
> +. ./test-lib.sh
> +
> +add_message '[subject]=One'
> +add_message '[subject]=Two'
> +add_message '[subject]=Three'
> +
> +notmuch tag +tag1 \*
> +notmuch tag +tag2 subject:Two
> +notmuch tag -tag1 +tag3 subject:Three
> +
> +test_expect_success "Running compact" "notmuch compact"
> +
> +test_begin_subtest "Compact preserves database"
> +output=$(notmuch search \* | notmuch_search_sanitize)
> +test_expect_equal "$output" "\
> +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
> +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 
> unread)
> +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"
> +
> +test_begin_subtest "Restoring backup"
> +rm -Rf ${TEST_TMPDIR}/mail/xapian
> +mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian
> +
> +output=$(notmuch search \* | notmuch_search_sanitize)
> +test_expect_equal "$output" "\
> +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
> +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 
> unread)
> +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"
> +
> +test_done
> diff --git a/test/notmuch-test b/test/notmuch-test
> index aa28bb0..ec94baf 100755
> --- a/test/notmuch-test
> +++ b/test/notmuch-test
> @@ -19,6 +19,7 @@ cd $(dirname "$0")
>  TESTS="
>basic
>help-test
> +  compact
>config
>setup
>new
> -- 
> 1.8.3.2
>
> ___
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 1/4] test: Add compact test

2013-10-31 Thread David Bremner

Ben Gamari  writes:

> Signed-off-by: Ben Gamari 
> ---
>  test/compact  | 32 
>  test/notmuch-test |  1 +

Pushed the tests.

d

[PATCH 1/4] test: Add compact test

2013-10-31 Thread Ben Gamari

Signed-off-by: Ben Gamari 
---
 test/compact  | 32 
 test/notmuch-test |  1 +
 2 files changed, 33 insertions(+)
 create mode 100755 test/compact

diff --git a/test/compact b/test/compact
new file mode 100755
index 000..5bb5cea
--- /dev/null
+++ b/test/compact
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+test_description='"notmuch compact"'
+. ./test-lib.sh
+
+add_message '[subject]=One'
+add_message '[subject]=Two'
+add_message '[subject]=Three'
+
+notmuch tag +tag1 \*
+notmuch tag +tag2 subject:Two
+notmuch tag -tag1 +tag3 subject:Three
+
+test_expect_success "Running compact" "notmuch compact"
+
+test_begin_subtest "Compact preserves database"
+output=$(notmuch search \* | notmuch_search_sanitize)
+test_expect_equal "$output" "\
+thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
+thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)
+thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"
+
+test_begin_subtest "Restoring backup"
+rm -Rf ${TEST_TMPDIR}/mail/xapian
+mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian
+
+output=$(notmuch search \* | notmuch_search_sanitize)
+test_expect_equal "$output" "\
+thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
+thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)
+thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"
+
+test_done
diff --git a/test/notmuch-test b/test/notmuch-test
index aa28bb0..ec94baf 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -19,6 +19,7 @@ cd $(dirname "$0")
 TESTS="
   basic
   help-test
+  compact
   config
   setup
   new
-- 
1.8.3.2

[PATCH 1/4] test: Add compact test

2013-10-31 Thread Ben Gamari

Tomi Ollila  writes:

> On Tue, Oct 29 2013, Ben Gamari  wrote:
>
>> Signed-off-by: Ben Gamari 
>> ---
>
> Patches 2, 3 & 4 Looks OK To Me. Thanks. A few comments on this patch 
> inline:
>
Thanks again for the review!

>>  test/compact  | 35 +++
>>  test/notmuch-test |  1 +
>>  2 files changed, 36 insertions(+)
>>  create mode 100755 test/compact
>>
>> diff --git a/test/compact b/test/compact
>> new file mode 100755
>> index 000..54e85ab
>> --- /dev/null
>> +++ b/test/compact
>> @@ -0,0 +1,35 @@
>> +#!/usr/bin/env bash
>> +test_description='"notmuch compact"'
>> +. ./test-lib.sh
>> +
>> +add_message '[subject]=One'
>> +add_message '[subject]=Two'
>> +add_message '[subject]=Three'
>> +
>> +notmuch tag +tag1 \*
>> +notmuch tag +tag2 subject:Two
>> +notmuch tag -tag1 +tag3 subject:Three
>> +
>> +test_begin_subtest "Compacting"
>> +notmuch compact
>> +test_expect_success "compact" "notmuch compact"
>
> test_expect_success executes "$2" ("notmuch compact" in this case)
> do you mean to run notmuch 'compact twice' ?
>
It's been a while but I suspect I just never cleaned up the patch after
coming to this realization. Anyways, it's fixed in the revised patch
coming shortly.

>> +notmuch search \*
>> +output=$(notmuch search \* | notmuch_search_sanitize)
>
> Now do you mean to run 'notmuch search \*' twice ?
>
>> +test_expect_equal "$output" "\
>> +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
>> +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 
>> unread)
>> +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"
>> +
>> +test_begin_subtest "Restoring backup"
>> +rm -Rf ${TEST_TMPDIR}/mail/xapian
>> +mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian
>> +
>> +notmuch search \*
>> +output=$(notmuch search \* | notmuch_search_sanitize)
>
> again... ?
>
>
> ... actually David Bremner had even more insightful comments in 
> id:874n8cw2yq.fsf at zancas.localnet to these same issues :D
>
Hmm, it seems I overlooked these. Thanks for the reference.

Cheers,

- Ben
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 489 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20131031/f45ed614/attachment.pgp>

Re: [PATCH 1/4] test: Add compact test

2013-10-31 Thread Tomi Ollila

On Thu, Oct 31 2013, Ben Gamari bgamari.f...@gmail.com wrote:

 Signed-off-by: Ben Gamari bgamari.f...@gmail.com

LGTM.

Tomi


 ---
  test/compact  | 32 
  test/notmuch-test |  1 +
  2 files changed, 33 insertions(+)
  create mode 100755 test/compact

 diff --git a/test/compact b/test/compact
 new file mode 100755
 index 000..5bb5cea
 --- /dev/null
 +++ b/test/compact
 @@ -0,0 +1,32 @@
 +#!/usr/bin/env bash
 +test_description='notmuch compact'
 +. ./test-lib.sh
 +
 +add_message '[subject]=One'
 +add_message '[subject]=Two'
 +add_message '[subject]=Three'
 +
 +notmuch tag +tag1 \*
 +notmuch tag +tag2 subject:Two
 +notmuch tag -tag1 +tag3 subject:Three
 +
 +test_expect_success Running compact notmuch compact
 +
 +test_begin_subtest Compact preserves database
 +output=$(notmuch search \* | notmuch_search_sanitize)
 +test_expect_equal $output \
 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 
 unread)
 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)
 +
 +test_begin_subtest Restoring backup
 +rm -Rf ${TEST_TMPDIR}/mail/xapian
 +mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian
 +
 +output=$(notmuch search \* | notmuch_search_sanitize)
 +test_expect_equal $output \
 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 
 unread)
 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)
 +
 +test_done
 diff --git a/test/notmuch-test b/test/notmuch-test
 index aa28bb0..ec94baf 100755
 --- a/test/notmuch-test
 +++ b/test/notmuch-test
 @@ -19,6 +19,7 @@ cd $(dirname $0)
  TESTS=
basic
help-test
 +  compact
config
setup
new
 -- 
 1.8.3.2

 ___
 notmuch mailing list
 notmuch@notmuchmail.org
 http://notmuchmail.org/mailman/listinfo/notmuch
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 1/4] test: Add compact test

2013-10-31 Thread David Bremner

Ben Gamari bgamari.f...@gmail.com writes:

 Signed-off-by: Ben Gamari bgamari.f...@gmail.com
 ---
  test/compact  | 32 
  test/notmuch-test |  1 +

Pushed the tests.

d
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

Re: Build broken on OS X 10.9

2013-10-31 Thread Michael Phillips

Jani Nikula jani@... writes:
 Please post the build log.

I'm building from homebrew, a popular package manager for OS X.  

When I run:

brew install -v notmuch --emacs

here's what I get in the log from configure:

Checking for Xapian development files... Yes (1.2.13).
Checking for GMime development files... Yes (gmime-2.6 = 2.6.7).
Checking for Glib development files (= 2.22)... Yes.
Checking for talloc development files... Yes.
Checking for valgrind development files... No (but that's fine).
Checking if emacs is available... Yes.
Checking which platform we are on... Mac OS X.
Checking for getline... Yes.
Checking for strcasestr... Yes.
Checking for rpath support... No (nothing to worry about).
Checking for -Wl,--as-needed... No (nothing to worry about).
Checking for available C++ compiler warning flags... 
-Wall -Wextra -Wwrite-strings
Checking for available C compiler warning flags... 
-Wall -Wextra -Wwrite-strings -Wmissing-declarations

...and from make:

emacs --quick --directory emacs -batch -l make-deps.el \
-f batch-make-deps emacs/notmuch-lib.el emacs/notmuch-parser.el 
emacs/notmuch.el emacs/notmuch-query.el \ 
emacs/notmuch-show.el emacs/notmuch-wash.el 
emacs/notmuch-hello.el emacs/notmuch-mua.el \ 
emacs/notmuch-address.el emacs/notmuch-
maildir-fcc.el emacs/notmuch-message.el \ 
emacs/notmuch-crypto.el emacs/notmuch-tag.el 
emacs/coolj.el emacs/notmuch-print.el  emacs/.eldeps.tmp  \
(cmp -s emacs/.eldeps.tmp emacs/.eldeps || mv emacs/.eldeps.tmp 
emacs/.eldeps)
mkdir: .deps/.: No such file or directory
make: *** [command-line-arguments.o] Error 1

HOMEBREW_VERSION: 0.9.5
HEAD: 916efbe93f0e9fd43e462d9dacf2836d26294d1b
CPU: quad-core 64-bit sandybridge
OS X: 10.9-x86_64
Xcode: 5.0.1
CLT: 5.0.1.0.1.1382131676
X11: N/A




___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 1/4] test: Add compact test

[PATCH 1/4] test: Add compact test

[PATCH 1/4] test: Add compact test

[PATCH 1/4] test: Add compact test

Re: [PATCH 1/4] test: Add compact test

Re: [PATCH 1/4] test: Add compact test

Re: Build broken on OS X 10.9

7 matches

Site Navigation

Mail list logo

Footer information