diff options
author | David Bremner <bremner@debian.org> | 2013-01-24 22:29:09 -0400 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2013-01-24 22:29:09 -0400 |
commit | 7264732a794b8d59b0aeef395e74381beb4b90f7 (patch) | |
tree | 01211ac9ba91d1f905ba805d56d4d587ec460ee6 /test | |
parent | aa48b23f3823606905cf99edfddc3ff62593cdd8 (diff) | |
parent | 79b0829082e62020de6eeb66e0c4f1ad19ded86c (diff) |
Merge branch 'release'
Conflicts:
NEWS
Inserted news from 0.15.1
Diffstat (limited to 'test')
-rw-r--r-- | test/test-lib.sh | 9 |
1 files 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 \ |