[18/22] t5319: don't write MIDX bitmaps in t5319

Message ID	dbd953815b640dfafa9044a70dc6dacbbf9302a4.1617991824.git.me@ttaylorr.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Date: Fri, 9 Apr 2021 14:12:09 -0400 From: Taylor Blau <me@ttaylorr.com> To: git@vger.kernel.org Cc: peff@peff.net, dstolee@microsoft.com, gitster@pobox.com, jonathantanmy@google.com Subject: [PATCH 18/22] t5319: don't write MIDX bitmaps in t5319 Message-ID: <dbd953815b640dfafa9044a70dc6dacbbf9302a4.1617991824.git.me@ttaylorr.com> References: <cover.1617991824.git.me@ttaylorr.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <cover.1617991824.git.me@ttaylorr.com> Precedence: bulk
Series	multi-pack reachability bitmaps \| expand [00/22] multi-pack reachability bitmaps [01/22] pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps [02/22] pack-bitmap-write.c: gracefully fail to write non-closed bitmaps [03/22] pack-bitmap-write.c: free existing bitmaps [04/22] Documentation: build 'technical/bitmap-format' by default [05/22] Documentation: describe MIDX-based bitmaps [06/22] midx: make a number of functions non-static [07/22] midx: clear auxiliary .rev after replacing the MIDX [08/22] midx: respect 'core.multiPackIndex' when writing [09/22] pack-bitmap.c: introduce 'bitmap_num_objects()' [10/22] pack-bitmap.c: introduce 'nth_bitmap_object_oid()' [11/22] pack-bitmap.c: introduce 'bitmap_is_preferred_refname()' [12/22] pack-bitmap: read multi-pack bitmaps [13/22] pack-bitmap: write multi-pack bitmaps [14/22] t5310: move some tests to lib-bitmap.sh [15/22] t/helper/test-read-midx.c: add --checksum mode [16/22] t5326: test multi-pack bitmap behavior [17/22] t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP [18/22] t5319: don't write MIDX bitmaps in t5319 [19/22] t7700: update to work with MIDX bitmap test knob [20/22] midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP' [21/22] p5310: extract full and partial bitmap tests [22/22] p5326: perf tests for MIDX bitmaps

Message ID

dbd953815b640dfafa9044a70dc6dacbbf9302a4.1617991824.git.me@ttaylorr.com (mailing list archive)

State

New, archived

Headers

Date: Fri, 9 Apr 2021 14:12:09 -0400
From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: peff@peff.net, dstolee@microsoft.com, gitster@pobox.com,
        jonathantanmy@google.com
Subject: [PATCH 18/22] t5319: don't write MIDX bitmaps in t5319
Message-ID: 
 <dbd953815b640dfafa9044a70dc6dacbbf9302a4.1617991824.git.me@ttaylorr.com>
References: <cover.1617991824.git.me@ttaylorr.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <cover.1617991824.git.me@ttaylorr.com>
Precedence: bulk

Series

multi-pack reachability bitmaps | expand

Commit Message

Taylor Blau April 9, 2021, 6:12 p.m. UTC

This test is specifically about generating a midx still respecting a
pack-based bitmap file. Generating a MIDX bitmap would confuse the test.
Let's override the 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP' variable to
make sure we don't do so.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
 t/t5319-multi-pack-index.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 5641d158df..69f1c815aa 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -474,7 +474,8 @@  test_expect_success 'repack preserves multi-pack-index when creating packs' '
 compare_results_with_midx "after repack"
 
 test_expect_success 'multi-pack-index and pack-bitmap' '
-	git -c repack.writeBitmaps=true repack -ad &&
+	GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+		git -c repack.writeBitmaps=true repack -ad &&
 	git multi-pack-index write &&
 	git rev-list --test-bitmap HEAD
 '

[18/22] t5319: don't write MIDX bitmaps in t5319

Commit Message

Patch