exec emacs at the end of run_emacs script

[obsolete/notmuch-old] / test / test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
index ff5183fff662afbc3cffab68ac7ffeef06d66a53..020bcb7a887a9c0ec10399d51306cb841e30e152 100755 (executable)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -39,7 +39,7 @@ done,*)
        ;;
 esac
 
-# Keep the original TERM for say_color
+# Keep the original TERM for say_color and test_emacs
 ORIGINAL_TERM=$TERM
 
 # For repeatability, reset the environment to known value.
@@ -830,7 +830,7 @@ export NOTMUCH_CONFIG=$NOTMUCH_CONFIG
 #
 # --load               Force loading of notmuch.el and test-lib.el
 
-emacs --no-init-file --no-site-file \
+exec emacs --no-init-file --no-site-file \
        --directory "$TEST_DIRECTORY/../emacs" --load notmuch.el \
        --directory "$TEST_DIRECTORY" --load test-lib.el \
        "\$@"
@@ -841,12 +841,15 @@ EOF
 test_emacs () {
        if [ -z "$EMACS_SERVER" ]; then
                EMACS_SERVER="notmuch-test-suite-$$"
-               # start a detached screen session with an emacs server
-               screen -S "$EMACS_SERVER" -d -m "$TMP_DIRECTORY/run_emacs" \
-                       --no-window-system \
-                       --eval "(setq server-name \"$EMACS_SERVER\")" \
-                       --eval '(server-start)' \
-                       --eval "(orphan-watchdog $$)" || return
+               # start a detached session with an emacs server
+               # user's TERM is given to dtach which assumes a minimally
+               # VT100-compatible terminal -- and emacs inherits that
+               TERM=$ORIGINAL_TERM dtach -n "$TMP_DIRECTORY/emacs-dtach-socket.$$" \
+                       sh -c "stty rows 24 cols 80; exec '$TMP_DIRECTORY/run_emacs' \
+                               --no-window-system \
+                               --eval '(setq server-name \"$EMACS_SERVER\")' \
+                               --eval '(server-start)' \
+                               --eval '(orphan-watchdog $$)'" || return
                # wait until the emacs server is up
                until test_emacs '()' 2>/dev/null; do
                        sleep 1