From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mB//NKUzoGAR3AAAgWs5BA (envelope-from ) for ; Sat, 15 May 2021 22:48:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gHahMKUzoGCEfwAAB5/wlQ (envelope-from ) for ; Sat, 15 May 2021 20:48:37 +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 8EB07AFCA for ; Sat, 15 May 2021 22:48:37 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 4975629038; Sat, 15 May 2021 16:48:17 -0400 (EDT) Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by mail.notmuchmail.org (Postfix) with ESMTPS id BDC1B26BF0 for ; Sat, 15 May 2021 16:48:07 -0400 (EDT) Received: by mail-oi1-x22f.google.com with SMTP id d21so2873441oic.11 for ; Sat, 15 May 2021 13:48:07 -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=ICwv8MzdqceaMNnjH+/dkHQIUFJmurDNNfFdoRJCKPQ=; b=Z4yzNiy19ZFGxGjnGPo4r0qhQ2SRDfximqMyDfa2RQYnWVbvyQDMmhzgpfL1zsD5gz svOqiapdOxU8LtbA5CrrIXE/Qenn4cxSAlkLk+RbZQ4rQVtjDcfjoQXha8HUv9eFodxk HGipQeQv9yOlHYYLMlQo39keM/cFhPZmR3GfKnGdixps4Uv4SGT01vEuztnd38cGmOPW aWf7DuUMGiPHaqxkssUp6s1KJVHrs12OySxvq/ehKKEht4omtPrBDgFXdTbQO5E+Gd/x NjUSz/Ry82LzYEP+feAEr1PMHJqzWenkk7Au+F1xPtXdUymvQX5jubUh+8v7xjC5ahpd aYAQ== 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=ICwv8MzdqceaMNnjH+/dkHQIUFJmurDNNfFdoRJCKPQ=; b=SGZze5mO9ngOXZWhyGdBDFqrp+W25XVj+UQH+DGxcJs4RIS10a3krbRkoAshAiFEoX ky9dkH7MD+8vvY+n21xN2AC8otW+4Ir++wPuoKFO51phkbGittMxxwuvKLfmDwoYNHsD UVLO+dlC1pr0nlAZvtomG/Lt++zI/PPjHtJhTWXkK+NtJPLfSyJ57mgooxNpNDAUr5UX XNkOzYtNLOSn0SP9VzJCHiKSap/itrQ3cjs43UEZ+P6bxWL7/+bgLA5a+lSpfQ9XjLmB xM8NI1YGHZBCooWBvvxjTW1Oiu6Nj6GqqqQXKsT8pEAUIGa0SgJ9pIXZhbJDgJdRskQc CtUg== X-Gm-Message-State: AOAM530AI1ihSEwMLr2JhGXURTfD+78dqdy7HFftjGUwhtDFovlJkn9m iTk0RF1F+obD5iJXSPwG4/p1ref6tyLNXw== X-Google-Smtp-Source: ABdhPJz7mYEuVmemvuvLGGWG83jaKzqsZYn0WAoe7M2QeF016bBQt9BurhPl9Dk7N2CAnG9mcWUuaQ== X-Received: by 2002:aca:de06:: with SMTP id v6mr10288534oig.91.1621111687074; Sat, 15 May 2021 13:48:07 -0700 (PDT) Received: from localhost (fixed-187-189-165-231.totalplay.net. [187.189.165.231]) by smtp.gmail.com with ESMTPSA id 2sm2164238ota.67.2021.05.15.13.48.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 May 2021 13:48:06 -0700 (PDT) From: Felipe Contreras To: notmuch@notmuchmail.org Subject: [PATCH v2 3/6] test: emacs: simplify missing dependencies check Date: Sat, 15 May 2021 15:47:41 -0500 Message-Id: <20210515204744.965206-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210515204744.965206-1-felipe.contreras@gmail.com> References: <20210515204744.965206-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Message-ID-Hash: QHNCZBPMB3FMDJ4IM3QES36EUSUD4EGX X-Message-ID-Hash: QHNCZBPMB3FMDJ4IM3QES36EUSUD4EGX 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=1621111717; 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=Gf5ErY/rAR3T+/8zLbtYusn/fcHAf2PlkcTuxGo7yEo=; b=jlNfd0oWZymOdRSBOh6MBofg5MP1TxMB0rTsdX8XKluatHwhTXSJEy3qdvsA6AnT3oQzed Gzd9WV4NzRv3flKDVcEgOXn7eHevrP2pABsmhPMnAn67NGTS9TMU/nPraLbgvBJ0kfPUXp a2HPdvhZYsbMJxoXUE5xbUG+RfLUQ/Z1b+OE2TuwmgtKgBPXmlPLpdOnjb8hQWe7cDZKgA SRtiaudc79Wdm+oEycTg2UJhS4/OFdz3Va/wLln8rCIL+QmHhTZfr9uKewU/qx/EzGd8Ec 6AffDhZ4O4MsfP1zoRTeLSMZlSwO08BZ0qfQIdIuEHNZT8TjiNEJZyRxm5mXAA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621111717; a=rsa-sha256; cv=none; b=unIdu/F6b/gRo6vg30b+ntS7bmiA2HxuHJn9jQqcnO/9a/bK07LU6X5hCSGpS/cHUqPYLt aJVzXDaHsdev0c1cGIYFQTKD6j8gSoGSHX/+EFeNYDnOikKBLtKQhx4Bmz1wOIcHgtzm5v 4Rhv6Ct286B3qV9BO3+v1M5SrqBX69VbkuETtDYkyGXCdxlbCQMleHC6txGqUpAdUsJ4z2 m4/aQ0dor5Va00iDZU/gkPrrSSdoRI1fAsVYZmWq6qFILrTlwDgoA5DctWX7DAyxpo6Qw8 bZf6QwJ+MPJeBBGNgKEjO907qIyVZni5Zj8n5XxA3kd6vIx1V7AW1PSTYAewXw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=Z4yzNiy1; 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: -0.97 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=Z4yzNiy1; 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 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 8EB07AFCA X-Spam-Score: -0.97 X-Migadu-Scanner: scn0.migadu.com X-TUID: F3uUmr574XHi No functional changes. Signed-off-by: Felipe Contreras --- test/test-lib.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index c1395c87..e1a597f7 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -115,9 +115,11 @@ unset EMAIL unset NAME 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 } add_gnupg_home () { @@ -1048,11 +1050,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.1