From patchwork Tue May 14 02:05:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Todd Zullinger X-Patchwork-Id: 10941899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7D0256C5 for ; Tue, 14 May 2019 02:05:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 688E728535 for ; Tue, 14 May 2019 02:05:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B3B12857E; Tue, 14 May 2019 02:05:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EF3C28535 for ; Tue, 14 May 2019 02:05:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726559AbfENCF3 (ORCPT ); Mon, 13 May 2019 22:05:29 -0400 Received: from pb-smtp21.pobox.com ([173.228.157.53]:62522 "EHLO pb-smtp21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726327AbfENCF2 (ORCPT ); Mon, 13 May 2019 22:05:28 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id BBA705FC44 for ; Mon, 13 May 2019 22:05:26 -0400 (EDT) (envelope-from tmz@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; s=sasl; bh=im7tPyYVhgYHvPaQysxbQghYM x8=; b=eGzbPt8m3I5ywsYG89+DWrVcZx7QPANjcgw0yUcBOUz1W9Ht/P+V70IpF mhIDBJVo1VGJXXRRX349uHlNLONDWwHmoG4vf/xMGCjruzOsOrMbRaSR7dG5sUs7 jpJheZz+igpl+QghN25JIBklcnzO2gbtiwsOdpEMUVn3ETyGJA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=sasl; b=VFevveTp99KCrRw5Yqb OhqGgVzfC7PS6X2KBpfW9CHdr9CPLn8dM1/w9mZlYJ/J4lLcL6X0CVs0SIBvIk3P voCX7IMOsRrPINTS8mGAFMvEHi7GfkX4VSfngabs5E5S29sPdcYySg1XaPoAhtyq FSWPgXgPNF0Zjxg7fXjKJZxg= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id B3E3B5FC43 for ; Mon, 13 May 2019 22:05:26 -0400 (EDT) (envelope-from tmz@pobox.com) Received: from pobox.com (unknown [173.67.141.44]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id AF9495FC42 for ; Mon, 13 May 2019 22:05:23 -0400 (EDT) (envelope-from tmz@pobox.com) Date: Mon, 13 May 2019 22:05:20 -0400 From: Todd Zullinger To: git@vger.kernel.org Subject: [PATCH] test-lib: try harder to ensure a working jgit Message-ID: <20190514020520.GI3654@pobox.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.11.1 (2018-12-01) X-Pobox-Relay-ID: BBFA8634-75EC-11E9-B63B-8D86F504CC47-09356542!pb-smtp21.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The JGIT prereq uses 'type jgit' to determine whether jgit is present. While this should be sufficient, if the jgit found is broken we'll waste time running tests which fail due to no fault of our own. Use 'jgit --version' instead, to catch some badly broken jgit installations. Signed-off-by: Todd Zullinger Reviewed-by: Jonathan Nieder --- I ran into such a broken jgit on Fedora >= 30¹. This is clearly a problem in the Fedora jgit package which will hopefully be resolved soon. But it may be good to avoid wasting time debugging tests which fail due to a broken tool outside of our control. ¹ https://bugzilla.redhat.com/1709624 t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 908ddb9c46..599fd70e14 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1522,7 +1522,7 @@ test_lazy_prereq NOT_ROOT ' ' test_lazy_prereq JGIT ' - type jgit + jgit --version ' # SANITY is about "can you correctly predict what the filesystem would