From d00303b718a4986c5e0211bbbfdbba20520d0c98 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Wed, 23 Jan 2013 19:25:39 +0200 Subject: [PATCH] Re: [PATCH 1/1] test/test-lib.sh: use vt100 as dtach terminal if TERM nonexistent or dumb --- c7/9d4fff8a4f887877f85486b3d6ebd9e5fad9c4 | 134 ++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 c7/9d4fff8a4f887877f85486b3d6ebd9e5fad9c4 diff --git a/c7/9d4fff8a4f887877f85486b3d6ebd9e5fad9c4 b/c7/9d4fff8a4f887877f85486b3d6ebd9e5fad9c4 new file mode 100644 index 000000000..e2242e19a --- /dev/null +++ b/c7/9d4fff8a4f887877f85486b3d6ebd9e5fad9c4 @@ -0,0 +1,134 @@ +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 346D9431FD9 + for ; Wed, 23 Jan 2013 09:25:49 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 J07Z3jpF00Ea for ; + Wed, 23 Jan 2013 09:25:48 -0800 (PST) +Received: from mail-la0-f46.google.com (mail-la0-f46.google.com + [209.85.215.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 546E4431FAE + for ; Wed, 23 Jan 2013 09:25:48 -0800 (PST) +Received: by mail-la0-f46.google.com with SMTP id fq12so6630168lab.33 + for ; Wed, 23 Jan 2013 09:25:46 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=x-received:from:to:cc:subject:in-reply-to:references:user-agent + :date:message-id:mime-version:content-type:x-gm-message-state; + bh=vF41OE51BPGhq5L+CiRI4RdPpn1A1ysyWJ4A05+pDbI=; + b=KcwaMGvRzq6j0R3PR6wl9jn07dF8WoK8alttSwsdF6w9ubBOgwh13YL6bi6TK5XNPF + /zJpaMXKogFy6crQXxdEtieqoDMPJb6WXYWP8JhHKQDfJdfXNEqgHHZw7nfvNojOm5YI + x9OjtW80W+kWWRyEq02wxwA4RDPW6jNu0iprjspIfY02vdkiAy55c5gvPxUYg5m+X7BP + hk+ZFMM+vNzlK+cahi7VKvbLQQi3hv4hXPPPZpMAof8NdPiXVaJIW+UeduD9lfy9h/4D + zxq2Ri6+mF+x9stOwSpFrs3BZ339Byj/fr9twk3E+4bowzwaB7DHGFXu/vkVz5A0rKpu + +Y9g== +X-Received: by 10.152.105.17 with SMTP id gi17mr2015177lab.46.1358961945413; + Wed, 23 Jan 2013 09:25:45 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id z4sm8676437lbn.17.2013.01.23.09.25.42 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Wed, 23 Jan 2013 09:25:44 -0800 (PST) +From: Jani Nikula +To: Tomi Ollila , notmuch@notmuchmail.org +Subject: Re: [PATCH 1/1] test/test-lib.sh: use vt100 as dtach terminal if TERM + nonexistent or dumb +In-Reply-To: <1358933736-300-1-git-send-email-tomi.ollila@iki.fi> +References: <1358933736-300-1-git-send-email-tomi.ollila@iki.fi> +User-Agent: Notmuch/0.14+255~gff3cc55 (http://notmuchmail.org) Emacs/24.2.1 + (x86_64-pc-linux-gnu) +Date: Wed, 23 Jan 2013 19:25:39 +0200 +Message-ID: <87fw1r6cbw.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain +X-Gm-Message-State: + ALoCoQn47Iwi0uXp2SQ+5NynLm56NcJ/N/wZlG7DTLzpc9MpCh5xCMn0KDOmf9MCbzdJMOQYHujk +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: Wed, 23 Jan 2013 17:25:49 -0000 + +On Wed, 23 Jan 2013, Tomi Ollila wrote: +> 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 + +Extra ( there? + +> (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 nonexistent) 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 nonexistent 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 6ce3b31..3bc67f7 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 + +That's just a tiny bit more trickery than I usually like... but then +it's shell after all... :) + +> + +> # 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' om case user's term is nonexistent +> + # or 'dumb') is given to dtach which assumes a minimally + +Nitpick, s/om/in/ + +Otherwise LGTM, and works as advertised. + + +Jani. + +> # 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.1 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2