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 ms0r.migadu.com with LMTPS id sLg2JLhBjWDkYQEALuJCtg (envelope-from ) for ; Sat, 01 May 2021 13:55:36 +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 MNcAILhBjWBlOQAA1q6Kng (envelope-from ) for ; Sat, 01 May 2021 11:55:36 +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)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2F4DD10BB5 for ; Sat, 1 May 2021 13:55:36 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 8F6D327DF8; Sat, 1 May 2021 07:54:59 -0400 (EDT) Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by mail.notmuchmail.org (Postfix) with ESMTPS id 8FC9B271EF for ; Sat, 1 May 2021 07:54:39 -0400 (EDT) Received: by mail-ot1-x335.google.com with SMTP id c36-20020a05683034a4b02902a5b84b1d12so531995otu.8 for ; Sat, 01 May 2021 04:54:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AV6h7h9OFbuQvdQdW61CX7+aA/y6k9xJM9Y+61NUDqE=; b=X6VtGyXh3OOr7un9LMV5pneMSuXyNiQlaESXaz9Ed1UE4dVsFOUxKEzTr4z5+ANICU pQ3b97JriN9YkbQi4pb7l324410YkC547ug/VQEJtrqn+RiQTQlX2szPLPsllPdpZpvj gD/c48vx9PfW+voFndTF2RtXIR8QyCO9nqlt1+213UBIH1cvTrB2PX8bj7bm+93v75NN unwf7zNglUF16e7F4xuNk+afEKpCeZDJKEv3hGEY4+qG6vLUntXFeBWMCMnzTQaQMW0Y dmEYMJzzP7cB3c8bZ9DtCicM4Dn1tOLoWw46t+xWUq6NREyLxxUQ4pcRM2VbBNiZOc1A vcRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AV6h7h9OFbuQvdQdW61CX7+aA/y6k9xJM9Y+61NUDqE=; b=glBgsMUUu7+0SIJkTzetWFqMSKALNjltamurutCEQDZu5lK9D7BiC72K5NEzf/EwMr V1B75zRzIh5VfXPIYLPgv+XS95bi/s+yaHjZ0EoNszSX4jqpygJ9v7dczwky0l+HMB96 88B3Gr4eFgwUTVQOSoFTXA2Xi3dPotnE3QvbarAS4JbK0C3gyG7mG1E6yuNC6rIE2NmU ppEdipFbRX/JfDtpGdAklJI+7XOWs9iydOZ0yuJcDumG9/wJ1GlMzMVdxqVZf1dJ7E4q ai/+92Ive3x0SmYsGjsBQTKKDTq22o1rL8PorudrfuVFMNLYXcgTtww85faQH5lgHjyd UByw== X-Gm-Message-State: AOAM533AwOKRT6kzDHRmboYpLjXzK/u4ic0af7E4kXGwXiUMgHl1uopN sQMJQOVtQVErL+GYZjpWdt7AY6RPsSFj1A== X-Google-Smtp-Source: ABdhPJx8mS2s/dE1it0Z4VrR6Llt4qOX6PswYcGId/g3yItQLzbBqs27ct1XHh5bEOE0g7EclDTFsQ== X-Received: by 2002:a9d:398b:: with SMTP id y11mr7347327otb.70.1619870078736; Sat, 01 May 2021 04:54:38 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id 16sm699359otu.79.2021.05.01.04.54.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 04:54:38 -0700 (PDT) From: Felipe Contreras To: notmuch@notmuchmail.org Subject: [PATCH 09/13] test: emacs: simplify missing dependencies check Date: Sat, 1 May 2021 06:54:18 -0500 Message-Id: <20210501115422.483314-10-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210501115422.483314-1-felipe.contreras@gmail.com> References: <20210501115422.483314-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Message-ID-Hash: M26H4ZCZML6SLQ3ZF3NQ5TGXEWCTOLBB X-Message-ID-Hash: M26H4ZCZML6SLQ3ZF3NQ5TGXEWCTOLBB X-MailFrom: felipe.contreras@gmail.com 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: Daniel Kahn Gillmor 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=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1619870136; 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=DycBjbO98CGm7pNTQskNi+MXtTov/W0vDv3vT0v/dtw=; b=AohB/hGZphV2TsSjvOeQlhA0DfDXBbgRHCXbMJORq1y5GfpPC00w+J3Md4sq8OJ+IkMJHH rXzb753K92V2NX8iXq501z0bpMbLRnDXhRg5x95Bo6hjT0HEukU5rLzr0sIHRBNvRpbQFU RNu578EKSnlvoeuFvo25/VykM+b4hZb+dkkjsckzOxrGmyLepUvzuUuQbDWua8+QSXeCU2 O755HYF0lvnU9AEffrHIMULXbTBPmnjJw0BYxirkb4OGIvA7F/lqgLuXKEqD/ioSww6qba danQkhSci2PhsK2MI97K5pJoFT+QNFe0EaZ++NZ+y4ldsVqtSXbJKseTc913Nw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1619870136; a=rsa-sha256; cv=none; b=ZocY6gN07rEl0wU89x7AImPNk72d56db/hoVEmMcnbOg7yG5MHJoeZwMCg2p/aEklF7qGl qTDhcVAORkdn6w95lqVOOM27kSdcHWog/kfFnImfLFUXCdI+F6p9RWjlenpxfqicxN9PGY 5W8QYMvgTlUa9Cb2YGdJWi1sEHvhq7Vdga7h265ROT4X4rGtoZockBXblQk3l7bUjwhwzU 9F9Urq6DIFtOB1sYDHsoKBDkPlvlt0hPITsPf14uvKkEYMwzqzKDjIixRPcwGkARXTk7e1 ntAPznfhNBUPYgXBf8rIfnzvIF6a7v3ratieHgz+j/gDuUgC90YWajIA9G0obA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=X6VtGyXh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: -0.96 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=X6VtGyXh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 2F4DD10BB5 X-Spam-Score: -0.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: 4Tm9NJMtN3V9 No functional changes. Signed-off-by: Felipe Contreras --- test/test-lib-emacs.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/test-lib-emacs.sh b/test/test-lib-emacs.sh index ecad501a..83f5b10b 100644 --- a/test/test-lib-emacs.sh +++ b/test/test-lib-emacs.sh @@ -15,9 +15,11 @@ # along with this program. If not, see https://www.gnu.org/licenses/ . test_require_emacs () { - test_require_external_prereq emacs - test_require_external_prereq ${TEST_EMACSCLIENT} - test_require_external_prereq dtach + local ret=0 + test_require_external_prereq emacs || ret=1 + test_require_external_prereq ${TEST_EMACSCLIENT} || ret=1 + test_require_external_prereq dtach || ret=1 + return $ret } # Deliver a message with emacs and add it to the database @@ -167,11 +169,7 @@ EOF test_emacs () { # test dependencies beforehand to avoid the waiting loop below - missing_dependencies= - test_require_external_prereq dtach || missing_dependencies=1 - test_require_external_prereq emacs || missing_dependencies=1 - test_require_external_prereq ${TEST_EMACSCLIENT} || missing_dependencies=1 - test -z "$missing_dependencies" || return + test_require_emacs || return if [ -z "$EMACS_SERVER" ]; then emacs_tests="$NOTMUCH_SRCDIR/test/${this_test_bare}.el" -- 2.31.0