From patchwork Sun Jul 26 19:53:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 11686087 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 240F56C1 for ; Sun, 26 Jul 2020 19:55:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0DC4320719 for ; Sun, 26 Jul 2020 19:55:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="QMg6Zqd3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728067AbgGZTzQ (ORCPT ); Sun, 26 Jul 2020 15:55:16 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40774 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727955AbgGZTzO (ORCPT ); Sun, 26 Jul 2020 15:55:14 -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 C52B760AFD; Sun, 26 Jul 2020 19:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1595793282; bh=OgCPGLxbLEhOK6+oRjiyLc+hvZl35cGnjxku2gGi4NE=; 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=QMg6Zqd3hZDiomwo8Ld5WKjUIERnkUU4iRscjuhpZoABctZvK5l0FNLen7G50Ce3x 0ciHOuD5m+zdkGBKgtQuSH6yPVsJa02qpQWXuA9WJA3BAZJAvOj1fiVHZ387oBxf01 UfPdI1lEseyUy3R5MGMoxT/qiJ+TxCKD/O/W/KFVrc0la6dUwddKuehMjKF4I1CI4q HusE0a4rWIBxfP4U0qu7OTSBLFPxUBQsHTRXATd8RuajmVqQDaW23viXAvhVm7jdfU cQd3hi8Obb63v1wKmeDKok0KFbkMsPlbsTNocCr4q69lTJUtOsStGmo2tq/aRaSD6D /Meq2lnUnAqROkBCQ+6Ue4sfe/Khs/tcvTmmhdTLRAYr3EhCd7pyeE+XbveYvYxqFx 1kFsG13wSVc8tNsErtDhAzi4ZUSZiXdV9iMdOJ26m8n+C5CV2a0Fkdy4E++uLLlB/i 3qhWxuJNgGJ8k56LUZJQbuYHOjgBKgtxiNre7dkcisg3hraJeLH From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v4 03/39] t3305: make hash agnostic Date: Sun, 26 Jul 2020 19:53:48 +0000 Message-Id: <20200726195424.626969-4-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.28.0.rc2.160.gd0b3904b262 In-Reply-To: <20200726195424.626969-1-sandals@crustytoothpaste.net> References: <20200726195424.626969-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When computing the fanout length, let's use test_oid to look up the hexadecimal size of the hash in question instead of hard-coding a value. Signed-off-by: brian m. carlson --- t/t3305-notes-fanout.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh index 3b4753e1b4..d5a94b7174 100755 --- a/t/t3305-notes-fanout.sh +++ b/t/t3305-notes-fanout.sh @@ -7,7 +7,7 @@ test_description='Test that adding/removing many notes triggers automatic fanout path_has_fanout() { path=$1 && fanout=$2 && - after_last_slash=$((40 - $fanout * 2)) && + after_last_slash=$(($(test_oid hexsz) - $fanout * 2)) && echo $path | grep -q "^\([0-9a-f]\{2\}/\)\{$fanout\}[0-9a-f]\{$after_last_slash\}$" } @@ -31,6 +31,7 @@ all_notes_have_fanout() { } test_expect_success 'tweak test environment' ' + test_oid_init && git checkout -b nondeterminism && test_commit A && git checkout --orphan with_notes;