From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id EDJTH54FqmANdgEAgWs5BA (envelope-from ) for ; Sun, 23 May 2021 09:34:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id aDQHG54FqmDEDQAA1q6Kng (envelope-from ) for ; Sun, 23 May 2021 07:34:54 +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 7D1B0B542 for ; Sun, 23 May 2021 09:34:53 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 15C332AAF3; Sun, 23 May 2021 03:34:50 -0400 (EDT) Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [IPv6:2a0b:5c81:1c1::37]) by mail.notmuchmail.org (Postfix) with ESMTPS id E93E12AA00 for ; Sun, 23 May 2021 03:34:47 -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 9790B1B000FD; Sun, 23 May 2021 10:34:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1621755286; 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: in-reply-to:in-reply-to:references:references; bh=JtY9OgiWpbgWUDz/lStLBumkThB5ICfb4YSMf6QGISc=; b=Mss7eeccX3958u/glY63qDRS9qW7WSk3kcBcFs7rgHj5Q0aUQhU4drwFWwJDuTrOh7NfeG QRG3Eqkiz0O2cjZgRWJs1odfb87v92gJgkzpOHQFehefWJJbtjgWJpwL7pgDztYnpzrBAD oUBTCCwVxJdRGHnpz3HxSfVn/RbmCBEjNEGaEw3/C3be5g3h3NmleDJerJSGss9tmZGyMx R94QZMPbzLXBzM5J62K9OSUYmNKzasuokuMF/+HJ+CrxnJno0NUZqD1iusab6ahjGS1jYv mA2reb1NKGH6Iy3XaaV3ZyNl6UU+pDPFszgRwqFc+WoiTcZu5pihzlbdY7BQJA== From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH v2] test: source $NOTMUCH_SRCDIR/test/test-lib-emacs.sh Date: Sun, 23 May 2021 10:34:43 +0300 Message-Id: <20210523073443.11618-1-tomi.ollila@iki.fi> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210522152741.27213-1-tomi.ollila@iki.fi> References: <20210522152741.27213-1-tomi.ollila@iki.fi> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1621755286; 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: in-reply-to:in-reply-to:references:references; bh=JtY9OgiWpbgWUDz/lStLBumkThB5ICfb4YSMf6QGISc=; b=KVx/fedis6CBKWDA7NyB6lPnNw25s8rff9pvuJRQ0mEqOx/Z9vUjOis8YzPVzid5cklHA2 MApSvU/oUPesFz3u08tcLYMjg7C6Va5ymZlSZVdyorSlTpweYvx/9Gugjl6cSF5wUj/vZ7 tbl+nll6QYG5pjPEqRzexseuFcH491J9WTLhkyPW7dCjVO6ZKyEL1INFx4LkEGZjIYkKex TLfO9yyewbrKVfF53SRIHEdOX+AzGxCZAzTM2cKPNmrJifSQgqXU+xzGMGWYqWbvKvI0oL 0tX61yK9EJnM1s10dznJKMB9KUOokiG1ASYht1wCtO4WfAKwcVUsAor7Uut3BA== 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=1621755286; a=rsa-sha256; cv=none; b=Lhg7tunhOU4tmzg2TiRh7zarFPuIqFcLlZ/Gp2htYdQCHwZZQIBEVi2AYI+mK63BkDAyfE LHNfJppC4fM3PYBBDSDiUpj04Ir8bbilnGs1+ascpxUkWC5iugCAhQ093NWbWD4eV6kKBJ 5uMdHY3ADn3BvY3fpcAztlvP9FJT+TJaQD2nIqWpTomIdYZewb8szrv757zp5HOyh/vATQ uiXdgJGj7y/SB0FyY5BhJnC+1UCQuzcKiwYkZncw1CPu6k7Lr484Wqyf8HC9NgZka6nVjJ CE4B98n78yN5l52mGyopxDAuXDpldBj0MqlYsEwY9qBlDPzSwSMrIXNHvj9+Mw== Message-ID-Hash: LKUSCXVJRLJAWTJIU56PTYCWPGUJWBDB X-Message-ID-Hash: LKUSCXVJRLJAWTJIU56PTYCWPGUJWBDB 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=1621755293; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=PwFWIbqzzS2LzsW9+1QvA0eOwDMJtUP853+HuASPZFk=; b=mixUtfFoE27u6LkFhgAapJXBPlcNHKFBUO0Ubhfm+PDQ5MLbUD5bkVrlylQq81VbKGs/2I 8Ipv9ouQDkxCykFb85jCLPxuBZsufZRkvF1HF8C9ywbMA7JMDzjIj6aO66l/T0CZMZ5Y8j cfSTp7qtlaqkUYmx5bWIvBDhfysI7ZxUTP692pTfxGw+s8JPMAjP1uL2Iz4IMLVdBG4FPy FYIx0i4H2L+jmI6PQ6mrbfjuvtsFXU+LPt6gKxkNhXKhPMKHcTqjsXO/Oogr/SAYtvCbGb nSOy1P690a7600ohB+bQMuyVk8jVoe9upHS5y37Y9i0SjaS57nN3HokfRZ25Ww== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1621755293; a=rsa-sha256; cv=fail; b=hHbEV/yTdxhcAdn5wMXeXKt3j8uwgFPTlwezZ4Js+4q0Q9d/tpAHm6q7sLmHk2gokYoRaV iHQGr//KAdCRXzczuW1jTLql37ZsaW1PgQs7+8yJFYElfxtkqFZvmbMhi/R8hZFaQ+6xlr QtpK6j89aYIxHm/5LW2GtsRAIqiaCjhPnqEBlS4dhdpsPkbsndfcHW/9H+/S+1FyXlEWtP wygQK2jNt0ZWSqanpYTJA2KyQvx+v9h4v0GTuM8DZU+tvbOBU7m/L9cridP9qJ2gFMEoLH t14F7eDcVFyRMGpauBV1sPlRzgxVI9wUVdxAqUbgUsjUfo0/xdhEB1KeyHpGWA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=Mss7eecc; 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: 2.93 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=Mss7eecc; 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: 7D1B0B542 X-Spam-Score: 2.93 X-Migadu-Scanner: scn1.migadu.com X-TUID: zVUyLnzWvCAm 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. --- s/_BUILDD/_SRCD/ to id:20210522152741.27213-1-tomi.ollila@iki.fi now works with in-tree and out-of-tree builds. 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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/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_SRCDIR/test/test-lib-emacs.sh || exit 1 test_require_emacs -- 2.25.1