From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ED44OPgiqWC8XQEAgWs5BA (envelope-from ) for ; Sat, 22 May 2021 17:27:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id YGbYM/giqWCnMAAAbx9fmQ (envelope-from ) for ; Sat, 22 May 2021 15:27:52 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (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 8A3522BBA1 for ; Sat, 22 May 2021 17:27:52 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id B77352AA0A; Sat, 22 May 2021 11:27:48 -0400 (EDT) Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) by mail.notmuchmail.org (Postfix) with ESMTPS id D63A82A9CB for ; Sat, 22 May 2021 11:27:45 -0400 (EDT) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 32FB51B00189; Sat, 22 May 2021 18:27:44 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1621697264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=15aKBzb6ep7RRHeBMGQFCYPD3qc2ZlcimhZxqjcrc58=; b=JqzXP7H/+nSvc/H5OhBKUNmdCNPnaLe6PQ914XaJyBpwCpvbJ6iJmMLJ1FU2aPILFxkBrZ eoHHAw6TUnDHSNiKjzSb7zVt2wC3kb4KRUYd8HK6VCKJwtlHmvzUdB7yf7bxoajrnvCDg6 MG339XY5gFV8klVWYhYLurVQwhyRW5dTXU9jC19NPD0rQfw7udBYG8Y/QNmWEFgjA1iiIu Px41I98xLoFpe06vPm5ZjNqdxqHk9+WmhQGVQyJAxaJHuGFJy1pOh36r2lm0ivyu8aNg0V uMA5HIlYipmMwMAJ12PQAsr7+bRBae5rR9q5hUFeo9N+4l7fnuVDtXgvTwWbCQ== From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH] test: source $NOTMUCH_BUILDDIR/test/test-lib-emacs.sh Date: Sat, 22 May 2021 18:27:41 +0300 Message-Id: <20210522152741.27213-1-tomi.ollila@iki.fi> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1621697264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=15aKBzb6ep7RRHeBMGQFCYPD3qc2ZlcimhZxqjcrc58=; b=PRzW9bcJChRwQK/3hUF3pXT3fWh9LC+eTyVgfLwKASG2XZHVwP9kxub57qxnbh9hOYweha MrDWmHCCZnp3vuesRlFojH9qO4DR7jghUNlWhOTFX+0RSzR2UovZjNW6yjiX2XvqfBNdxU nj0g2v4amy52AROqNsyKePgoZsxZwgsSiT6uphz7AbqMN5boJb95DsHpxnqzbjFjwJO26Q n0yRdFFWlP2pbxshort8P+GeNddyf5T8DSMKzSWbUtdS6R7UaXG/16eDFrFMEGI23pcham Guky7jgdfUlWrk9+mzgSMTdr6YMGnEULdoSZCkWoctTzpbLL+EccPjwurcIGZg== 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=1621697264; a=rsa-sha256; cv=none; b=VuUN6lZdmEXKuRPvNuWRDEd9kiYMLy/Ji62HvXMWisQ+9uisb5DvBH0NXnOhqEzpjwBDzV ACnJ2duJJ+5mMNMP4/0ruK8lbuzilmCW2XiI9mICbzerYlm6W2/4Oj0XRp1HfbpQQEOEwQ mC7eK0zspKMu1DAS10hXDfKDIowpvWOTlKsux/Fd8pIGWmwaAI5kcXt+irAPh8As8soBw3 KwC0JxOgCT5GTC7hN8jdRuoj69nIOF+/0rciP0GCzw8kimJdGgS4+7FrHnBGwr4CfuqB3V u0zlZkOh/9Fa7QTD6IahcL8EiMtZQHJMpLgCZzSqqR7O9fRUVBawxzMZfbBlkA== Message-ID-Hash: UM5OCSQUANAMFLWL3HTNCE4UD26CTZRY X-Message-ID-Hash: UM5OCSQUANAMFLWL3HTNCE4UD26CTZRY 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 CC: tomi.ollila@iki.fi 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=1621697272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=60eE2jMxI/rGc+QdoxMguCFBHlTgmdfcgTSacHnf7nQ=; b=e06GhlveZwuN8iJ2QWz3Qlcfxlj6HSE1cODCdPeUS5HJjRaqot3hpWGfZHZwlahkhj2Y5T Bw2OJH/S3Zumoj07zd1tVeOKY/6avSexm7hyO9kSXZqlySmBtEcEHCW9BzdCto1obCg9wj 85x5ey3sJu158wDKSyiYUjh8yaVXvSvuw0VeLID0CedKlvpAZRxc+FeCBGcFJVJAvz32Tz tUUDOlWBr7Azwl0DT62cgcE9V6lb1OTMZD4+MGCfJ4KDCSrsE+dlpKour9oH9JPLQGoOnP hpQGGTHID+MjknPryY/LPZqKijnipxQE96BoFRlOl85LfjaQfWB3+zsb5dPZHQ== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1621697272; a=rsa-sha256; cv=fail; b=UOqcM9llzK3zOUwPmpTvKS+ILDi53V8NPEaK0LedXhkZ0bXR/k8ll2n6M7L+oCP1MgjHT/ JLVWl5XzMBopNJin3vo3hJDHlUBZQLrhvGf7PY9XWCl+lerBldZa3593rT2e3H/oAUrA0C yiQp1cnM2RmjmXTBFZoJa/qLN/9JKyIakku6LUHB+8Po5lTIjoaSoxOmMXDWNlg8C/FvKT cD1Aerlsdz3NoCXqJaVc3lwsDrvtxOdrZjZcPMXXR+cmNMLw9ZFwbbcmVOIoSOodSNlC5T xXwNUeQ5Tb8+U5hd72sgyD6Lk6qYLPbumL6H0plTs/buQE0d+xs1KVNUNGX0ug== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b="JqzXP7H/"; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 2.93 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b="JqzXP7H/"; 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 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 8A3522BBA1 X-Spam-Score: 2.93 X-Migadu-Scanner: scn0.migadu.com X-TUID: DMtKFdYUw+ZQ 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 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