From a12f810a00cf0779e9b62c400f7ccd7af9d3a113 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Thu, 24 Jan 2013 09:39:02 +0200 Subject: [PATCH 1/5] test/test-lib.sh: use vt100 as dtach terminal if TERM dumb or unset/empty The TERM environment variable is set to 'dumb' when running tests, but the original value of it is stored for echoing colors and running emacs (somewhat interactively) in detached session. Emacs requires some terminal control sequences to be available for interactive operation. In case original TERM is (also) 'dumb' (or unset/empty) emacs cannot run interactively. To fix this problem dtach (and emacs as it's child process) is run with TERM=vt100 in case original TERM was unset, empty or 'dumb'. This way there is a chance to run emacs tests with different user terminals and potentially find problems there. --- test/test-lib.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index 6ce3b318..84db7926 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -41,6 +41,10 @@ esac # Keep the original TERM for say_color and test_emacs ORIGINAL_TERM=$TERM +# dtach(1) provides more capable terminal environment to anything +# that requires more than dumb terminal... +[ x"${TERM:-dumb}" = xdumb ] && DTACH_TERM=vt100 || DTACH_TERM=$TERM + # For repeatability, reset the environment to known value. LANG=C LC_ALL=C @@ -996,9 +1000,10 @@ test_emacs () { fi server_name="notmuch-test-suite-$$" # start a detached session with an emacs server - # user's TERM is given to dtach which assumes a minimally + # user's TERM (or 'vt100' in case user's TERM is unset, empty + # or 'dumb') is given to dtach which assumes a minimally # VT100-compatible terminal -- and emacs inherits that - TERM=$ORIGINAL_TERM dtach -n "$TEST_TMPDIR/emacs-dtach-socket.$$" \ + TERM=$DTACH_TERM dtach -n "$TEST_TMPDIR/emacs-dtach-socket.$$" \ sh -c "stty rows 24 cols 80; exec '$TMP_DIRECTORY/run_emacs' \ --no-window-system \ $load_emacs_tests \ From d273ed6cf1bdaa2d644cec4909cbf415ff4d257b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 24 Jan 2013 07:11:27 -0400 Subject: [PATCH 2/5] version: bump to 0.15.1 A simple bugfix release, no user visible changes --- bindings/python/notmuch/version.py | 2 +- man/man1/notmuch-config.1 | 2 +- man/man1/notmuch-count.1 | 2 +- man/man1/notmuch-dump.1 | 2 +- man/man1/notmuch-new.1 | 2 +- man/man1/notmuch-reply.1 | 2 +- man/man1/notmuch-restore.1 | 2 +- man/man1/notmuch-search.1 | 2 +- man/man1/notmuch-show.1 | 2 +- man/man1/notmuch-tag.1 | 2 +- man/man1/notmuch.1 | 2 +- man/man5/notmuch-hooks.5 | 2 +- man/man7/notmuch-search-terms.7 | 2 +- version | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index c9efbd98..6a1b7084 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,2 +1,2 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.15' +__VERSION__ = '0.15.1' diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 557eae5d..6204a594 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-CONFIG 1 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-CONFIG 1 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-config \- access notmuch configuration file .SH SYNOPSIS diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index d63be997..7f8bbac7 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COUNT 1 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-COUNT 1 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-count \- count messages matching the given search terms .SH SYNOPSIS diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index 613fd699..799fd7b6 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-DUMP 1 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-DUMP 1 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-dump \- creates a plain-text dump of the tags of each message diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index 06c4dfae..2ee6a8f0 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-NEW 1 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-NEW 1 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-new \- incorporate new mail into the notmuch database .SH SYNOPSIS diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index 13e50ada..2751e96b 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-REPLY 1 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-REPLY 1 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-reply \- constructs a reply template for a set of messages diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index 895c6d29..52aae41e 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-RESTORE 1 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-RESTORE 1 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-restore \- restores the tags from the given file (see notmuch dump) diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 321d7797..acd8863a 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH 1 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-SEARCH 1 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-search \- search for messages matching the given search terms .SH SYNOPSIS diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 3f9584bb..5d4ccfab 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SHOW 1 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-SHOW 1 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-show \- show messages matching the given search terms .SH SYNOPSIS diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 081bd0e4..a65eb426 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-TAG 1 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-TAG 1 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-tag \- add/remove tags for all messages matching the search terms diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1 index 69805cb5..9b25c275 100644 --- a/man/man1/notmuch.1 +++ b/man/man1/notmuch.1 @@ -16,7 +16,7 @@ .\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" .\" Author: Carl Worth -.TH NOTMUCH 1 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH 1 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch \- thread-based email index, search, and tagging .SH SYNOPSIS diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5 index 4ed61c15..a543d5d7 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -1,4 +1,4 @@ -.TH NOTMUCH-HOOKS 5 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-HOOKS 5 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-hooks \- hooks for notmuch diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index 19e5fd5f..8916fdad 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH-TERMS 7 2013-01-18 "Notmuch 0.15" +.TH NOTMUCH-SEARCH-TERMS 7 2013-01-24 "Notmuch 0.15.1" .SH NAME notmuch-search-terms \- syntax for notmuch queries diff --git a/version b/version index 2856407c..e815b861 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.15 +0.15.1 From 2ad8b489332492d946a609c3175f7423c716ddcf Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 24 Jan 2013 07:13:16 -0400 Subject: [PATCH 3/5] debian: re-enable tests Now that we have Tomi's fix to set TERM for dtach, it should be safe to run the tests on the autobuilders. --- debian/rules | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/rules b/debian/rules index 0eb3357b..c4e3930d 100755 --- a/debian/rules +++ b/debian/rules @@ -8,9 +8,6 @@ python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {} override_dh_auto_configure: dh_auto_configure -- --emacslispdir=/usr/share/emacs/site-lisp/notmuch -override_dh_auto_test: - echo tests disabled. - override_dh_auto_build: dh_auto_build dh_auto_build --sourcedirectory bindings/python From a512b0402b55e31caf9967e4c6ab5a731afb707a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 24 Jan 2013 07:18:58 -0400 Subject: [PATCH 4/5] NEWS: update for 0.15.1 Not much to report here, just the one patch --- NEWS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/NEWS b/NEWS index 1cb52ddc..97f23058 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +Notmuch 0.15.1 (2013-01-24) +========================= + +Internal test framework changes +------------------------------- + +Set a default value for TERM when running tests. This fixes certain +build failures in non-interactive environments. + Notmuch 0.15 (2013-01-18) ========================= From 79b0829082e62020de6eeb66e0c4f1ad19ded86c Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 24 Jan 2013 07:23:15 -0400 Subject: [PATCH 5/5] debian: changelog stanza for 0.15.1-1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 96c8531f..943ea91d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +notmuch (0.15.1-1) experimental; urgency=low + + * Upstream bug fix release: set default TERM for running tests. + * Re-enable build time self-tests. + + -- David Bremner Thu, 24 Jan 2013 07:19:45 -0400 + notmuch (0.15-2) experimental; urgency=low * Disable tests until a proper fix for running tests without a