From: Tomi Ollila Date: Thu, 24 Jan 2013 07:39:02 +0000 (+0200) Subject: [PATCH V3 1/1] test/test-lib.sh: use vt100 as dtach terminal if TERM dumb or unset... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fb551d01fca8a268a58bf2b49b1755edaeb0070;p=notmuch-archives.git [PATCH V3 1/1] test/test-lib.sh: use vt100 as dtach terminal if TERM dumb or unset/empty --- diff --git a/31/29330263e53da17a02f33cb6769973906aef05 b/31/29330263e53da17a02f33cb6769973906aef05 new file mode 100644 index 000000000..05b19f6d9 --- /dev/null +++ b/31/29330263e53da17a02f33cb6769973906aef05 @@ -0,0 +1,97 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 00134431FAF + for ; Wed, 23 Jan 2013 23:39:14 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id GsroEie7YqDd for ; + Wed, 23 Jan 2013 23:39:14 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 587B0431FAE + for ; Wed, 23 Jan 2013 23:39:14 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 018AA100086; Thu, 24 Jan 2013 09:39:03 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH V3 1/1] test/test-lib.sh: use vt100 as dtach terminal if TERM + dumb or unset/empty +Date: Thu, 24 Jan 2013 09:39:02 +0200 +Message-Id: <1359013142-3329-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <1359011360-15591-1-git-send-email-tomi.ollila@iki.fi> +References: <1359011360-15591-1-git-send-email-tomi.ollila@iki.fi> +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 24 Jan 2013 07:39:15 -0000 + +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. +--- + +Obsoletes id:1359011360-15591-1-git-send-email-tomi.ollila@iki.fi + +To be accurate (instead of potentially confusing), the commit +message and comments have been edited to mention 'unset or empty' +instead of 'nonexistent'. No functional changes (to neither v1 or v2 +of this patch). + + 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 6ce3b31..1567178 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 \ +-- +1.8.0 +