From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0r.migadu.com with LMTPS id AACZJadBjWCDYAEALuJCtg (envelope-from ) for ; Sat, 01 May 2021 13:55:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +E1DIadBjWD8bgAAbx9fmQ (envelope-from ) for ; Sat, 01 May 2021 11:55:19 +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 4701A10DE5 for ; Sat, 1 May 2021 13:55:19 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 7970227DC2; Sat, 1 May 2021 07:54:47 -0400 (EDT) Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by mail.notmuchmail.org (Postfix) with ESMTPS id 90ECC1FAC2 for ; Sat, 1 May 2021 07:54:34 -0400 (EDT) Received: by mail-oi1-x22d.google.com with SMTP id i11so802003oig.8 for ; Sat, 01 May 2021 04:54:34 -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=USdTn2ff29f5Q3xyIyhNHPnDJFCZiVRCbc+5ijKEWFE=; b=Qj2p7sb4Gb2k357wS6Oy5pd/R31ehDQgH6rtKg+ALwx7H2E/QZrBEb6axg+uZAVUm5 3rp+sFJzvKytjbpDvMbL/0g36l8HEjO7utJmQ9gyqlp5sG47b9/B0Rld4v6vKX1ACFjD 1IoXyWAVrphD5Y4c9qeZcOTb0Qub6EDnPFPtc88Tfmm9cd3PNVXDCXuqXH/VXblh3jlp vUkUpPEbputghzGTTWFkRqZqKyKhQ6zMV583e2tI4VeH+8BMOuT5KUXtuJ3z4px+IJwf jNQ7TdHh65M/PZ1V2WNeHCpe4ugv7ql4Ep4ExYrjXamCXp7FiX7S/jEfztc/EpSKjq6s 5B3w== 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=USdTn2ff29f5Q3xyIyhNHPnDJFCZiVRCbc+5ijKEWFE=; b=pI0Yso6ZY8Apa6xY+eXDFyCHG5lXq94OiDWkCmkhTHewqBhHW29WJs8DzyJUZ7nQBv o6GMFW2aHODqvFU/YteXoI/NPQJig430apd4Ok93RvHFfrYjyNGrmo0DVfubaQXo+In2 A2xTjqUcUgN1XlYVAnQ83s4FHuzvJUiRh7IdrzOVfMiOfjB5wTGyGI3WYFjWSjfAbo7P HTWXrCvuniSxwmqBNBFl2aY+vuA0nw+KiPr8fuT5OQ+btSLWPxHu68hXb+cT6W32Eb2U xNqSE2HdlHK6CavwFVtqOQPDEyjk1vQlF0yycN5OGSLLz8b1rX1pNULdxdNHr/Jx2O9t AgEA== X-Gm-Message-State: AOAM532BHVitr0KSCcUjHrx0YcgMDxRQ6uJOaAL14hdL28PKqP4aaR5O KKkivCGIYTEGrrTi4xTystVHkIT34ahxpQ== X-Google-Smtp-Source: ABdhPJwbvsE8XdXrAOmX3oqC+jmT5jAtLddO2dV1K9OGTSZMuWse8K5tHVjqbd6qoCJMZfTkargT5A== X-Received: by 2002:aca:408b:: with SMTP id n133mr14835186oia.13.1619870072538; Sat, 01 May 2021 04:54:32 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id p15sm1393598otl.23.2021.05.01.04.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 04:54:32 -0700 (PDT) From: Felipe Contreras To: notmuch@notmuchmail.org Subject: [PATCH 05/13] test: fix wrong SKIP messages Date: Sat, 1 May 2021 06:54:14 -0500 Message-Id: <20210501115422.483314-6-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: FAMXTUJAXJYYTLJVDPYIE7CPXFQDAK22 X-Message-ID-Hash: FAMXTUJAXJYYTLJVDPYIE7CPXFQDAK22 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=1619870119; 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=sQ/w33sgCCCVvzLMAhgxXfRIr6wUn3PvG1s+gjh1peE=; b=u8JPF1t4p5NX4+Zj+vbiUaLzqzLMfXaMJwhkxyRjEoTR/poQEVDGY3u0D70cChplkQnZom 0l+4dvif0vDVJbr+V5skt1LvAwKDs+VlaVFeDrQj0sFHDCufDDdXyhGoeZrCweLpeb0aN1 o18ZosP9+kyjfxJTxRrSkoblzI9IoRBWuS0ksZcHbhx5toPLrPgamS87qVzFgAWf1ssYo1 uoufzQ2JCueVB3Ncaedg+O0VRDAYFvgDrfVKSC8OoBB7BjS4zjBhOrnuZvvCXjgmnM//s9 f3wGNFBNCOKoXII1BZhI+kEEbiCMnkjZC4WUeC6ztVije1xL50NfE+TMpRqnoQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1619870119; a=rsa-sha256; cv=none; b=p4nO5aJhFtqqA2BTNrAJ1VWByinIk1sD2xozke9+9GWeqZgJ3pnkvSS5I+A02NMabsgchG QqHexaPzna71AtuxU0ysfVtegwe3klzmtR7lPE8pj1gxtR+U8AgYhS/R86h+29KMXZJ5jM KUXenaRuIUDkUwLSE4+cPrj9ngnBXmoP1ZfBL8Zt11qAb7r2JeRencKcY7oDZHCM+gipZa 1gmJ7Fjt032RlwyA1L7eSl32KjLvASqfVJug7UPskjz7wxY0C3KtF5vAkCfRddxzXV4JYd u1btgSjIEuLeAIQ6it4GZQe07Q0OR7NARAQRcResIguzxNJNuKbAACVeIRwTbw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=Qj2p7sb4; 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=Qj2p7sb4; 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: 4701A10DE5 X-Spam-Score: -0.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: hUh7zOy51/Ux When the external prereqs are updated inside the body of the command (e.g. test_emacs) the message in test_report_skip_ is wrong: it outputs the body of the command instead of the subtest name. We need to pass the same argument we pass to test_skip. Signed-off-by: Felipe Contreras --- test/test-lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index 21dda265..1067316d 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -919,7 +919,7 @@ test_expect_success () { test_run_ "$1" run_ret="$?" # test_run_ may update missing external prerequisites - test_check_missing_external_prereqs_ "$@" || + test_check_missing_external_prereqs_ "$test_subtest_name" || if [ "$run_ret" = 0 -a "$eval_ret" = 0 ] then test_ok_ @@ -943,7 +943,7 @@ test_expect_code () { test_run_ "$2" run_ret="$?" # test_run_ may update missing external prerequisites, - test_check_missing_external_prereqs_ "$@" || + test_check_missing_external_prereqs_ "$test_subtest_name" || if [ "$run_ret" = 0 -a "$eval_ret" = "$1" ] then test_ok_ -- 2.31.0