From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iK1WHpO3jWCVBgEAgWs5BA (envelope-from ) for ; Sat, 01 May 2021 22:18:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sPgUGpO3jWCNWAAAbx9fmQ (envelope-from ) for ; Sat, 01 May 2021 20:18:27 +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 9604818C32 for ; Sat, 1 May 2021 22:18:26 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 8BFF92716D; Sat, 1 May 2021 16:18:22 -0400 (EDT) Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [IPv6:2a0b:5c81:1c1::37]) by mail.notmuchmail.org (Postfix) with ESMTPS id 54E531FBC5 for ; Sat, 1 May 2021 16:18:17 -0400 (EDT) Received: from guru.guru-group.fi (unknown [IPv6:2a02:2380:1:9:5054:ff:feb7:a4bc]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 3F7951B0102A; Sat, 1 May 2021 23:18:16 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1619900296; 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: in-reply-to:in-reply-to:references:references; bh=m+mHI84sOSOMkL2ABx0zIIEfbmHRVZHaMpITbbfDJrI=; b=s+AHy7IsJ+urb79cYifHLkmyHgw6+VVj13p2w5p8/M7zAlgBcg5vXMyOMYqRwUzpYGX0SH nubEhH7k79BLRTB7YfIjm6TRMllZgCKP6YcMHW8J/81RisV93RSlIZmgqAiilGh4nl3InC PMgwjA3R4t+ymvNKDjhGvg72st7Gq1J590fL9iofAKQ7DR2NZk5j+BQXSQwiHNcDLbASd1 p4fMYuxKl1i0VhXd+VsaAud/Y7C9huNZEAOTwIWtDGxtRM6X9uY2XF3ZyaehXfPc+VW6R7 3ROSNDQULOurZJ1AK30pMONqu4mubFdrDOF/JQEw5IB8BYJZddBgTR+K1HcJZw== From: Tomi Ollila To: Felipe Contreras , notmuch@notmuchmail.org Subject: Re: [PATCH 05/13] test: fix wrong SKIP messages In-Reply-To: <20210501115422.483314-6-felipe.contreras@gmail.com> References: <20210501115422.483314-1-felipe.contreras@gmail.com> <20210501115422.483314-6-felipe.contreras@gmail.com> User-Agent: Notmuch/0.31.4+128~gc67b63a (https://notmuchmail.org) Emacs/27.1 X-Face: HhBM'cA~ MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1619900296; 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: in-reply-to:in-reply-to:references:references; bh=m+mHI84sOSOMkL2ABx0zIIEfbmHRVZHaMpITbbfDJrI=; b=a/Y7m90KXpLaqj1T81EIqJwMjXwBLUPeAu/y+o4oOXbfT+p6FHsmola1MrIzPV+5undp7h MHHRsI8q2rpuTCC4W4Rd27z2F6uA5+c8xvf+f533ZUDF0yOj8hovv4ZMIv4Zd6xamddsyW Zt3V14B96EL9mgJkxDOLEBXxDyKGVASPfRbZpPz/zthwzBjPnLhLfRfRlQNASzkeMpVAkR ckXgg8kQrWsHw7BtbwXnY9u4Ze6t88rA10uy8DvBpwWkAHv6luh/f9F3ZgqdH6w7k3hz3T QylMPx9nCrsA4cHnvj/1Pth/pqBYqMQPlb9RLVUP+LLRYD5/EM9QQN7EP06YcQ== 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=1619900296; a=rsa-sha256; cv=none; b=GkQLMvi+naWX15ZbVl8KJmbsCLbNMSbHwQPZW3FS3hknEWLwxJ78gNjHKm3GBtYmvhngC+ HEw6HMgJHOnMA5BZ9ElOjs5zaXdV3oFOWKs80hAiCw+EJAy24A0CXIoqGgT3MJ2TbbxgeM 4rDG4tzXptuEbjKtFV0hqYVpDOBm5LVJ1NygCZEIjirVUerIpXElDTkmrrdfLXX1we3Mt6 h1Cuv/b4jX5dn/FZLQAe352JvMvstQHfZBRtZXVvUDZu/8yqc/VtW+0anmRd5W0SyLS0tH azs8u30UKA4/CrBq8QtrLnMeOaktl1Gma9Wq5t4ZZp4SsRjmS+q7v8qFzAdJ/A== Message-ID-Hash: KEVKMZGQWQIZFTCKYNEHHP2HQ7EECLTG X-Message-ID-Hash: KEVKMZGQWQIZFTCKYNEHHP2HQ7EECLTG 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: 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=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1619900306; 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=EtLEkZ1K535NttsHnrTmeijjx7hRUc/E41uqV8TmVgM=; b=FxAG4t6yDAbKLK1eo414KDKepDHUCvxxzAU/OgSJQ6Xxi+x4alyZUejXzm8nCHQM/Z6Nhj foZQ0yglUA8dTMBcTrzv13T0SRokUdBqC0UIcU/8NqPK0ymytkzhWOAIU30ND28/8va2x0 +jKqfrbvmG0enD/ZXek4Qxypk4GT0Y91MLkWXMu7qcMg48DO3nucsfNnk3HszJryKCrTxh s5ary7NoEvKnlpeGotG2wdA3m5n+e+jpULj4ygpH+ktjkgyoPODwZBduCU/UUDyeIdXztx sGuKqcHr4z9MV+qT7o1BSHVMC30PLLLHq6/yv79XdwhjiKqhFlJk/X5UQ6cQYQ== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1619900306; a=rsa-sha256; cv=fail; b=eJUVxL6KWxTMBbD+PWqAoIQik7nTB1osiaNTLzk7TKgMQiYHM7qRNaxhz2Mrx7eAJQSG6f h15aH6V9ZapmJO0stFVR+DgYdn+jfVj1x+dJ33n8Brfz3jM+PKrkULiW31YyoBm5qwqgO9 oxC6vSPy7jJuujNueeqaYgS7886MBlPNyEE4KyS0uNEjyNdeS1w3CCUGpDE34HuDsvLVN8 O++12dw0DtGOIW/8mqN9CRTKwuBj5Bi3gAwt0Q+xIlL4ZeHS9Dr2H+dn7Z29eK8xPT3JOj OGmisZ/GfKMBZcc22RiLw299A1zsGGfFHho9KfF3RigjiaxKakNeqR/QRlp+hA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=s+AHy7Is; 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: 0.94 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=s+AHy7Is; 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: 9604818C32 X-Spam-Score: 0.94 X-Migadu-Scanner: scn0.migadu.com X-TUID: UFqdWVhW0mwL On Sat, May 01 2021, Felipe Contreras wrote: > 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" || Looks sensible to me. hard to verify ;/ Tomi > if [ "$run_ret" = 0 -a "$eval_ret" = "$1" ] > then > test_ok_ > --