From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 04C421F5B1 for ; Wed, 29 Jul 2020 23:15:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728144AbgG2XPN (ORCPT ); Wed, 29 Jul 2020 19:15:13 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:41120 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728103AbgG2XPE (ORCPT ); Wed, 29 Jul 2020 19:15:04 -0400 Received: from camp.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:b610:a2f0:36c1:12e3]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id 7192E6101A; Wed, 29 Jul 2020 23:15:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1596064501; bh=2wb0pxNxxHB8AyR/+6fbiG1mvbjofu/+IuiJcIxweiA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=oh/1+xzT1l/WrBR7bHCBuDa3D1GcemEQXSvcMBUv97xe6Zm/aM5kg3/TZhuVFnn01 1pjntMHJPXQJDIZIwMy1e6gQeo7ZvR/Mk1KdW3B92RmKE0qCWwhzCv4p/MmBF9GGv1 gf86WYaB4QENZ9jepAPkPVu74LgfVsMAxuUUyhfzQV3gp5FrokN5BkvLRpPkE+PFJX WS9DOuyvgaMY+0wb0YeqGgzfAaRcXpzycxhX9QlHIJWFi5zxpKaspkTI4MVi1MreqG vbh2VNp8DRm1YRTlwoVGQjse+dk/8QrR7novmTm6EW6SnsskIPxPVaRWrCyldmFbzg d7K1+VkwjtaTi7dEdOhWdA9LxSgeomkzXsX+K7EiNWZyqMAEmyfWU63OXxMTGbSzjn XSK05oVxBiBACZ2MqDHdvojQ38KWwZCC2v/4AKFFwSIxFGeIfthbWmslN3MTZdGwiU Qd5aCBisNdOXJqCmkp/8uEFFAf3SWBtkZk/Dict+gh5v1CIKaF+ From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v6 35/39] t: allow testing different hash algorithms via environment Date: Wed, 29 Jul 2020 23:14:24 +0000 Message-Id: <20200729231428.3658647-36-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6 In-Reply-To: <20200729231428.3658647-1-sandals@crustytoothpaste.net> References: <20200728233446.3066485-1-sandals@crustytoothpaste.net> <20200729231428.3658647-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org To allow developers to run the testsuite with a different algorithm than the default, provide an environment variable, GIT_TEST_DEFAULT_HASH, to specify the algorithm to use. Compute the fixed constants using test_oid. Move the constant initialization down below the point where test-lib-functions.sh is loaded so the functions are defined. Signed-off-by: brian m. carlson --- t/test-lib-functions.sh | 4 +--- t/test-lib.sh | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 2608e80f11..2e01bb2c2b 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1417,9 +1417,7 @@ test_set_hash () { # Detect the hash algorithm in use. test_detect_hash () { - # Currently we only support SHA-1, but in the future this function will - # actually detect the algorithm in use. - test_hash_algo='sha1' + test_hash_algo="${GIT_TEST_DEFAULT_HASH:-sha1}" } # Load common hash metadata and common placeholder object IDs for use with diff --git a/t/test-lib.sh b/t/test-lib.sh index 618a7c8d5b..307bb2207e 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -452,6 +452,9 @@ export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME export EDITOR +GIT_DEFAULT_HASH="${GIT_TEST_DEFAULT_HASH:-sha1}" +export GIT_DEFAULT_HASH + # Tests using GIT_TRACE typically don't want : output GIT_TRACE_BARE=1 export GIT_TRACE_BARE