From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iOwlGiEsqWApcAEAgWs5BA (envelope-from ) for ; Sat, 22 May 2021 18:06:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id cKHiFSEsqWDpEQAAB5/wlQ (envelope-from ) for ; Sat, 22 May 2021 16:06:57 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C266A2C1F4 for ; Sat, 22 May 2021 18:06:56 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 4485C2AA56; Sat, 22 May 2021 12:06:53 -0400 (EDT) Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [IPv6:2a0b:5c81:1c1::37]) by mail.notmuchmail.org (Postfix) with ESMTPS id ECF902AA43 for ; Sat, 22 May 2021 12:06:50 -0400 (EDT) Received: from guru.guru-group.fi (unknown [IPv6:2a02:2380:1:9:5054:ff:feb7:a4bc]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 15A151B00101 for ; Sat, 22 May 2021 19:06:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1621699608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2mN7uu9ch5nNa5cw5cX+GDoWnIfWzocAYEbN1PdsTF4=; b=JSs3GiAcGz+ql76o+JMKp+OjYcG/PNSK18qEaPFq8chMl0cgJSG2j3+1RJN9MSqQlkYHea 1FF//NxL8ZLK5LoSC+5gmI1T4pLVtsJujpMtT9wQcDmFmaxKOZAIB06uF+gDpop9iEMo0L ZzXgNpcCzfUOoXgUyfa7/8YRwQGC+LIh9r0Pg+UIzSVG8MBu9zf+yDrZv7NufkD5y0tEjh kzqXpTHxTxn70fKGj8H63Uk3a8lLGbzTicdN1ouBTylgyr8ruudfIyU1jAcLkWacxz0dAp cjnwZdTrxFivrLLWhujXNJaDvKMyk8hmRyjSV9nZ3w7bHzN8bX27i4JDkcd9Kg== From: Tomi Ollila To: notmuch@notmuchmail.org Subject: Re: [PATCH] test: source $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh In-Reply-To: <20210522152741.27213-1-tomi.ollila@iki.fi> References: <20210522152741.27213-1-tomi.ollila@iki.fi> User-Agent: Notmuch/0.32+21~gfdddd4c (https://notmuchmail.org) Emacs/27.1 X-Face: HhBM'cA~ MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1621699608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2mN7uu9ch5nNa5cw5cX+GDoWnIfWzocAYEbN1PdsTF4=; b=TqGoHGc9hZ5RU2gV93RGNoCSez7O1BO10/Mxbed6whVJ8KCpd4VVXCrdTDxeWFJZYPzpK9 ivVxCl0cHcsyMUkwlK2yH0vTM7b5TRBhjTGSzqrbfVXl8PR9mNbSAKHUzyE3yEjMSunEbw QLU1q4sa6nzQUKgaY5UEtYYhVMnfQCS+K5QVua8Er2icmj6Yw63w9ftpgW1LJ0qd63fJ/3 75hczXCad5D6DxCww+yCNhYEzQxF76InVGqEXLCInOAZ9QtYLbmqP+vMPMedfsjTg5m0NN 5d0lvWZTithcWNYamllxu5Tz+T/y8A8rC3BPImawMAF73/lQW2ESLs6p2k9Raw== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1621699608; a=rsa-sha256; cv=none; b=nEmKlP3udwWfR57SoLaawevYEGJ7/w6LJNZA2FFMVoPs3EXdfvjU5CxZj5VCzrRj7egr+U UeM3k9dhLq0et/TRpcxtcFReXiO4LgvrYN+9je/LhqGx2l8Az5REuAMX3YN+OA98iyWA77 1qZXnpl1o01GKOl/Dr+7CFngsCJ1DFcpAut4/yOD3Bbscx1aSpVGeR1Vtzn2oNWE3e3A1l //aG5mh1X9Dg7aUameBGxmn+0NgqVxHrTqD0HkFlNwhyYyTYEgLhFnbZMUi0gfgWZpqUVu pOdT9VMT92hi30lOoTim0+TLfsocCr3hK/hCysOlvG66jOaoCa5Aw0NzdNw6lA== Message-ID-Hash: RFPYDFQJ2IOFLEL3QNV52Y4SJAFRGYWK X-Message-ID-Hash: RFPYDFQJ2IOFLEL3QNV52Y4SJAFRGYWK X-MailFrom: tomi.ollila@iki.fi X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1621699617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=PRY6L1rcOW/NV/ASbUgfwJXCstrhl8E9Z/0/hYBHKTI=; b=Dec00PQU88KqF4z0+wMXLRrk9vrv0BKd1FHM9HUxufZMQLXS1sP6UHbwZGI0jiuuOUWsuA 7XKJfp2od8uJRRw8QOcGr7mgfSaibbR6cJ7AnyR9ZJa5OK7sLz8Z6T7DMmDUCDhOu3tIuK 0ibUL5WYrNWbih2ZfjlYk2iIgOuIel5b6hfgzcap7HVu5xPwjoRa2/3J/rvdBlSbtHfxlp RoCBncCiRWRd2wq4cNXp9dkHdebBn6AItMq6zt71EDnXZ0JAVGFHXv+ey6atOFmWFOb+xZ rZDOhA3NTdR0lgeltRBvmIFIQDTorLfd2coMeQgEOke6xRA/yME3thTDTBtSiA== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1621699617; a=rsa-sha256; cv=fail; b=hdNDpm45tYI4diuHOFvosyEV5FTVMfHfrs4oWLp0hm4zT5EtjAkZ80JrAN88QTAQppndSo aNEuAdyGkZcFH9uAMMLTIteAyR4CyNpgBzjIzaFUKJrJ1OqtHHK44GInnhG0JuzSlBdGkc eqf7o2iV/fAmQz9Ds2wDsKS35TUw0R0OEn4pEUnj9f4ZqrFiPk+ozqKvlP17TRzRyOwcO9 TQz/8ME/KCi54gJ0DWHeMJow4ZukHNBe2nnX7iIt0q1c6KzoOeIKe65JJRxy6wIMUTtZTW x8KWK3nQ5RhxCHTCaUbeRPmg1GKZ0HMohcIzfGlNU6VXON92EvnYU5HjG224yA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=JSs3GiAc; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 1.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=JSs3GiAc; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: C266A2C1F4 X-Spam-Score: 1.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: cBOLk6hhhxBS On Sat, May 22 2021, Tomi Ollila wrote: > Sourcing test-lib.sh will cd to TMP_DIRECTORY, so > relative path in $0 will not work in previous version > . $(dirname "$0")/test-lib-emacs.sh > > Now individual test scripts -- e.g. ./test/T310-emacs.sh > will work. > --- > test/T160-json.sh | 2 +- > test/T170-sexp.sh | 2 +- > test/T310-emacs.sh | 2 +- > test/T320-emacs-large-search-buffer.sh | 2 +- > test/T330-emacs-subject-to-filename.sh | 2 +- > test/T350-crypto.sh | 2 +- > test/T355-smime.sh | 2 +- > test/T357-index-decryption.sh | 2 +- > test/T358-emacs-protected-headers.sh | 2 +- > test/T420-emacs-test-functions.sh | 2 +- > test/T430-emacs-address-cleaning.sh | 2 +- > test/T440-emacs-hello.sh | 2 +- > test/T450-emacs-show.sh | 2 +- > test/T455-emacs-charsets.sh | 2 +- > test/T460-emacs-tree.sh | 2 +- > test/T510-thread-replies.sh | 2 +- > test/T630-emacs-draft.sh | 2 +- > test/T720-emacs-attachment-warnings.sh | 2 +- > test/T730-emacs-forwarding.sh | 2 +- > 19 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/test/T160-json.sh b/test/T160-json.sh > index 638afb4d..9b3bc676 100755 > --- a/test/T160-json.sh > +++ b/test/T160-json.sh > @@ -1,7 +1,7 @@ > #!/usr/bin/env bash > test_description="--format=json output" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 Too hastily posted; tested that this worked when did in-tree build, so failed to notice that this should be $NOTMUCH_SRCDIR -- will test later -- first sed -i s/_BUILDD/_SRCD/ to the patch file, then apply patch and finally run tests in both in-tree and out of tree builds... Tomi > > test_begin_subtest "Show message: json" > add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[bcc]=\"test_suite+bcc@notmuchmail.org\"" "[reply-to]=\"test_suite+replyto@notmuchmail.org\"" "[body]=\"json-show-message\"" > diff --git a/test/T170-sexp.sh b/test/T170-sexp.sh > index af8c4b44..94648d49 100755 > --- a/test/T170-sexp.sh > +++ b/test/T170-sexp.sh > @@ -1,7 +1,7 @@ > #!/usr/bin/env bash > test_description="--format=sexp output" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > test_begin_subtest "Show message: sexp" > add_message "[subject]=\"sexp-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[bcc]=\"test_suite+bcc@notmuchmail.org\"" "[reply-to]=\"test_suite+replyto@notmuchmail.org\"" "[body]=\"sexp-show-message\"" > diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh > index 1ece6e00..8f114571 100755 > --- a/test/T310-emacs.sh > +++ b/test/T310-emacs.sh > @@ -2,7 +2,7 @@ > > test_description="emacs interface" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > EXPECTED=$NOTMUCH_SRCDIR/test/emacs.expected-output > > diff --git a/test/T320-emacs-large-search-buffer.sh b/test/T320-emacs-large-search-buffer.sh > index d2638c8b..9c42e7f1 100755 > --- a/test/T320-emacs-large-search-buffer.sh > +++ b/test/T320-emacs-large-search-buffer.sh > @@ -1,7 +1,7 @@ > #!/usr/bin/env bash > test_description="Emacs with large search results buffer" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > x=xxxxxxxxxx # 10 > x=$x$x$x$x$x$x$x$x$x$x # 100 > diff --git a/test/T330-emacs-subject-to-filename.sh b/test/T330-emacs-subject-to-filename.sh > index 6e09a048..b55566bf 100755 > --- a/test/T330-emacs-subject-to-filename.sh > +++ b/test/T330-emacs-subject-to-filename.sh > @@ -2,7 +2,7 @@ > > test_description="emacs: mail subject to filename" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > test_require_emacs > > diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh > index 4508c984..3bcf1488 100755 > --- a/test/T350-crypto.sh > +++ b/test/T350-crypto.sh > @@ -6,7 +6,7 @@ > > test_description='PGP/MIME signature verification and decryption' > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > ################################################## > > diff --git a/test/T355-smime.sh b/test/T355-smime.sh > index 69bdcfac..7fa9d337 100755 > --- a/test/T355-smime.sh > +++ b/test/T355-smime.sh > @@ -2,7 +2,7 @@ > > test_description='S/MIME signature verification and decryption' > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > test_require_emacs > test_require_external_prereq openssl > diff --git a/test/T357-index-decryption.sh b/test/T357-index-decryption.sh > index 0d30e566..7b5f13db 100755 > --- a/test/T357-index-decryption.sh > +++ b/test/T357-index-decryption.sh > @@ -4,7 +4,7 @@ > > test_description='indexing decrypted mail' > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > ################################################## > > diff --git a/test/T358-emacs-protected-headers.sh b/test/T358-emacs-protected-headers.sh > index b25d7ea7..b296a9c5 100755 > --- a/test/T358-emacs-protected-headers.sh > +++ b/test/T358-emacs-protected-headers.sh > @@ -2,7 +2,7 @@ > > test_description="protected headers in emacs interface" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > # testing protected headers with emacs > test_require_emacs > diff --git a/test/T420-emacs-test-functions.sh b/test/T420-emacs-test-functions.sh > index 22e4f01e..cb3820b3 100755 > --- a/test/T420-emacs-test-functions.sh > +++ b/test/T420-emacs-test-functions.sh > @@ -2,7 +2,7 @@ > > test_description="emacs test function sanity" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > test_begin_subtest "emacs test function sanity" > test_emacs_expect_t 't' > diff --git a/test/T430-emacs-address-cleaning.sh b/test/T430-emacs-address-cleaning.sh > index 640bff3f..4063dd0d 100755 > --- a/test/T430-emacs-address-cleaning.sh > +++ b/test/T430-emacs-address-cleaning.sh > @@ -2,7 +2,7 @@ > > test_description="emacs address cleaning" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > test_require_emacs > > diff --git a/test/T440-emacs-hello.sh b/test/T440-emacs-hello.sh > index 642aa3cc..acd2e57e 100755 > --- a/test/T440-emacs-hello.sh > +++ b/test/T440-emacs-hello.sh > @@ -2,7 +2,7 @@ > > test_description="emacs notmuch-hello view" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > EXPECTED=$NOTMUCH_SRCDIR/test/emacs.expected-output > > diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh > index e58124d4..5e3e4ecd 100755 > --- a/test/T450-emacs-show.sh > +++ b/test/T450-emacs-show.sh > @@ -2,7 +2,7 @@ > > test_description="emacs notmuch-show view" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > EXPECTED=$NOTMUCH_SRCDIR/test/emacs-show.expected-output > > diff --git a/test/T455-emacs-charsets.sh b/test/T455-emacs-charsets.sh > index a0f4dc24..dbc4c71e 100755 > --- a/test/T455-emacs-charsets.sh > +++ b/test/T455-emacs-charsets.sh > @@ -2,7 +2,7 @@ > > test_description="emacs notmuch-show charset handling" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > > UTF8_YEN=$'\xef\xbf\xa5' > diff --git a/test/T460-emacs-tree.sh b/test/T460-emacs-tree.sh > index dfc69049..ce2bbfe7 100755 > --- a/test/T460-emacs-tree.sh > +++ b/test/T460-emacs-tree.sh > @@ -2,7 +2,7 @@ > > test_description="emacs tree view interface" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > EXPECTED=$NOTMUCH_SRCDIR/test/emacs-tree.expected-output > > diff --git a/test/T510-thread-replies.sh b/test/T510-thread-replies.sh > index cdb4be44..a6be6867 100755 > --- a/test/T510-thread-replies.sh > +++ b/test/T510-thread-replies.sh > @@ -10,7 +10,7 @@ test_description='test of proper handling of in-reply-to and references headers' > # non-RFC-compliant headers' > > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > test_begin_subtest "Use References when In-Reply-To is broken" > add_message '[id]="foo@one.com"' \ > diff --git a/test/T630-emacs-draft.sh b/test/T630-emacs-draft.sh > index 8553f022..495b0a69 100755 > --- a/test/T630-emacs-draft.sh > +++ b/test/T630-emacs-draft.sh > @@ -1,7 +1,7 @@ > #!/usr/bin/env bash > test_description="Emacs Draft Handling" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > test_require_emacs > add_email_corpus > diff --git a/test/T720-emacs-attachment-warnings.sh b/test/T720-emacs-attachment-warnings.sh > index 4e8c5d26..f361f7ac 100755 > --- a/test/T720-emacs-attachment-warnings.sh > +++ b/test/T720-emacs-attachment-warnings.sh > @@ -2,7 +2,7 @@ > > test_description="emacs attachment warnings" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > test_require_emacs > > diff --git a/test/T730-emacs-forwarding.sh b/test/T730-emacs-forwarding.sh > index 378067ed..5593ae5d 100755 > --- a/test/T730-emacs-forwarding.sh > +++ b/test/T730-emacs-forwarding.sh > @@ -2,7 +2,7 @@ > > test_description="emacs forwarding" > . $(dirname "$0")/test-lib.sh || exit 1 > -. $(dirname "$0")/test-lib-emacs.sh || exit 1 > +. $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh || exit 1 > > test_require_emacs > > -- > 2.25.1