[13/24] t5309: make test hash independent

Message ID	20200113123857.3684632-14-sandals@crustytoothpaste.net (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=G+/Y=3C=vger.kernel.org=git-owner@kernel.org> From: "brian m. carlson" <sandals@crustytoothpaste.net> To: <git@vger.kernel.org> Cc: Jonathan Tan <jonathantanmy@google.com>, Johannes Schindelin <Johannes.Schindelin@gmx.de> Subject: [PATCH 13/24] t5309: make test hash independent Date: Mon, 13 Jan 2020 12:38:46 +0000 Message-Id: <20200113123857.3684632-14-sandals@crustytoothpaste.net> In-Reply-To: <20200113123857.3684632-1-sandals@crustytoothpaste.net> References: <20200113123857.3684632-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	SHA-256 test fixes, part 8 \| expand [00/24] SHA-256 test fixes, part 8 [02/24] t3206: make hash size independent [03/24] t3305: annotate with SHA1 prerequisite [04/24] t3308: make test work with SHA-256 [05/24] t3309: make test work with SHA-256 [06/24] t3310: make test work with SHA-256 [07/24] t3311: make test work with SHA-256 [08/24] t3404: remove SHA1 prerequisite [09/24] t4013: make test hash independent [10/24] t4060: make test work with SHA-256 [11/24] t4211: make test hash independent [12/24] t5302: make hash size independent [13/24] t5309: make test hash independent [14/24] t5313: make test hash independent [15/24] t5321: make test hash independent [16/24] t5515: make test hash independent [17/24] t5318: update for SHA-256 [18/24] t5616: use correct filter syntax [19/24] t5607: make hash size independent [20/24] t5703: make test work with SHA-256 [21/24] t5703: switch tests to use test_oid [22/24] t6000: abstract away SHA-1-specific constants [23/24] t6006: make hash size independent [24/24] t6024: update for SHA-256

Message ID

20200113123857.3684632-14-sandals@crustytoothpaste.net (mailing list archive)

State

New, archived

Headers

From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: Jonathan Tan <jonathantanmy@google.com>,
        Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 13/24] t5309: make test hash independent
Date: Mon, 13 Jan 2020 12:38:46 +0000
Message-Id: <20200113123857.3684632-14-sandals@crustytoothpaste.net>
In-Reply-To: <20200113123857.3684632-1-sandals@crustytoothpaste.net>
References: <20200113123857.3684632-1-sandals@crustytoothpaste.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

SHA-256 test fixes, part 8 | expand

Commit Message

brian m. carlson Jan. 13, 2020, 12:38 p.m. UTC

Use the proper pack constants defined in lib-pack.sh to make this test
work with SHA-256.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t5309-pack-delta-cycles.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/t/t5309-pack-delta-cycles.sh b/t/t5309-pack-delta-cycles.sh
index 491556dad9..b6b9792913 100755
--- a/t/t5309-pack-delta-cycles.sh
+++ b/t/t5309-pack-delta-cycles.sh
@@ -4,15 +4,9 @@  test_description='test index-pack handling of delta cycles in packfiles'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-pack.sh
 
-if ! test_have_prereq SHA1
-then
-       skip_all='not using SHA-1 for objects'
-       test_done
-fi
-
 # Two similar-ish objects that we have computed deltas between.
-A=01d7713666f4de822776c7622c10f1b07de280dc
-B=e68fe8129b546b101aee9510c5328e7f21ca1d18
+A=$(test_oid packlib_7_0)
+B=$(test_oid packlib_7_76)
 
 # double-check our hand-constucted packs
 test_expect_success 'index-pack works with a single delta (A->B)' '

[13/24] t5309: make test hash independent

Commit Message

Patch