From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6FbuGImChGCETQAAgWs5BA (envelope-from ) for ; Sat, 24 Apr 2021 22:41:45 +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 IPZmFImChGCNRgAAbx9fmQ (envelope-from ) for ; Sat, 24 Apr 2021 20:41:45 +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 1B6758719 for ; Sat, 24 Apr 2021 22:41:45 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 9998926874; Sat, 24 Apr 2021 16:41:40 -0400 (EDT) Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by mail.notmuchmail.org (Postfix) with ESMTPS id 130C82022F for ; Sat, 24 Apr 2021 16:41:38 -0400 (EDT) Received: by mail-wm1-x32a.google.com with SMTP id n10-20020a05600c4f8ab0290130f0d3cba3so7320521wmq.1 for ; Sat, 24 Apr 2021 13:41:37 -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:mime-version :content-transfer-encoding; bh=keZPYZT7QOCn3D86Z394UOTbIlEDHf7sFG4BoN/msxg=; b=oBE9NMt0koTwffRCAtRgUzhH0USHDq5TgzUJOCaBHjbde/4j3HMJ1X9rXuhk9MFIXz Ls16GV35Z0Al44XO4/dkJkImDUWvnjhrAuGi/qIfVvoMtNM6RyjqSbDcniLo1+59FWkT h3ZmZSo9i16pSrv9yA2Ix6rBrZuueSdhq3aUs+97vsw9XSB3aJ29cxCO1mJKlDsKMIDC n35BYvGRYC41SqZzIfakjuosNqQaNm5jGBlFh7U7JlzTXIzQ9i0EPjP/76ynARpHL3/F 8AOgALwJ+bmW2d6R0Y1h5d+1NAhpvToYQG5N9aL3fy9hq3BXSUBBB7EL9ie2h/ksNkJk LO4w== 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:mime-version :content-transfer-encoding; bh=keZPYZT7QOCn3D86Z394UOTbIlEDHf7sFG4BoN/msxg=; b=WwSkSm+nW4w5L6khqex7jy1d5QeHxZPfs10Ub47auU7SU3cvpVxo3Nb+xOh8piNFXE l9+yRZulDohZkvuixZWQtGffoQA36M2HM6Txmh+DeBFIVXJmIl7j0g1WHjQSqi+k9viq B8w9mgn/RLwYBZCSsnYNbGs0QemR2Zq+XE4KBt5KSKOgdXoOhdpQm9hGD8SVgdyyJ+aO MwH6Q0QG36yOAbGXg8OWHe982HGAnFar0aaUaGtJdYtQ5g0F84pZgRHui9OlLXDh1Wl5 QouPZ+7jxg+IwD502caJvjrnleCUAIYhHl9z6ZAB4pm5oUY6epn4ebH+KhsWNYXJKdNS bR/g== X-Gm-Message-State: AOAM532skN4Yjo+IE0cksuxZFn+C2LNzRdUvWSyQqoDSjSNc71tYZCWW svPJadzJg2Ngos/7JO9sJy/dWyfqm7tJZg== X-Google-Smtp-Source: ABdhPJzNTakNlVbdKoE/VqOW+EWL8RQVHAHKhJhDCfrHDUwCd8m1t1wQI1ekX2TqUEUml3rXHde+zw== X-Received: by 2002:a05:600c:365a:: with SMTP id y26mr10694752wmq.102.1619296896328; Sat, 24 Apr 2021 13:41:36 -0700 (PDT) Received: from localhost.localdomain ([90.255.50.46]) by smtp.gmail.com with ESMTPSA id b16sm14626658wmb.39.2021.04.24.13.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 13:41:35 -0700 (PDT) From: Tobias Backer Dirks To: notmuch@notmuchmail.org Subject: [PATCH] test: check for GNU parallel with --version options Date: Sat, 24 Apr 2021 21:41:03 +0100 Message-Id: <20210424204103.769665-1-omgitsaheadcrab@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Message-ID-Hash: E22Q4DUY5N6FZQET7S4PDTD5PC6HLE7Z X-Message-ID-Hash: E22Q4DUY5N6FZQET7S4PDTD5PC6HLE7Z X-MailFrom: omgitsaheadcrab@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: Tobias Backer Dirks 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=1619296905; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Zals7VYWjHWdanzdSx9uQUyUOrAWeeWy6+Qlh8EMlA4=; b=KUdM0ylfuolSY7RjIW06l60F5OQoGd9BWh1ZVjcnDwkbe7/ET8K/Ah7sePKQPFvW2vbc0g QOusfppbPxx3zlg5Z+R8NQzmfht0/2byh1nRr8h18VlKfDpK5+M1g2hhom7RUnZCL6aE6B nR5EVxmx9iCJPAxpLm0TGGd4BlPiOqgnA+/uivuKK/f3euCAQisBRZtgzIhRqKq8jDpCPT HNNWYxtVrFF07wEmSXwLpPslLGl+68u2kmz2DZMBxD8D0uuroSi4uz/z8Jr5SF64ZylZfj Rf9YQWD55dKmIxx4pq00nPor0bq3jGJu8lMeAqhETa0bKXm5h0XDT/uJFu6wAg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1619296905; a=rsa-sha256; cv=none; b=CiNa4JoUYuaF0USOOWaRB1eTovXvfpGaiEQ/i3FIi5nOTw/75xOIawREEN27xipNRTWrSZ Iuts13Mvw57tadUv6Iw0sh21xlgNB67cYqxujayoBVP/84NkBBETLHOp2Npy5IDuewR1CY QseCJaG/4q4Aa246/KJvFoK1ID4SrQVyRyVzuwAvV0bU9HHotDjuc9UhyBV/QYcNFBqjKc nfQz3JxCcaFTygdzzGR1ry/teFQXKbuUigPqsseUF9buqoB5I9tWoC3AuRufCG97FNrou5 heo/C4IhWya7E3D/wzbwl663e7PyQHHNJ6MNtWKfVrG5RsKEuBN05A5fso/yyw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=oBE9NMt0; 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-Spam-Score: -0.02 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20161025 header.b=oBE9NMt0; 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: 1B6758719 X-Spam-Score: -0.02 X-Migadu-Scanner: scn0.migadu.com X-TUID: 7G34zIbuEqjY The lastest versions of GNU parallel no longer make mention of GNU within their help output. This causes the test script to mistakenly use the moreutils parallel execution. In order to fix this, while maintaining compatibility with previous versions of GNU parallel, --version should be used. Signed-off-by: Tobias Backer Dirks --- test/notmuch-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/notmuch-test b/test/notmuch-test index b58fd3b3..91909264 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -50,7 +50,7 @@ META_FAILURE= # Run the tests if test -z "$NOTMUCH_TEST_SERIALIZE" && command -v parallel >/dev/null ; then test -t 1 && export COLORS_WITHOUT_TTY=t || : - if parallel -h | grep -q GNU ; then + if parallel --version | grep -q GNU ; then echo "INFO: running tests with GNU parallel" printf '%s\n' $TESTS | $TEST_TIMEOUT_CMD parallel else -- 2.31.1