t/perf: avoid testing bitmaps without lookup table

In a previous commit, the setting which controls whether or not the
pack- and MIDX-bitmap machinery writes a lookup table,
'pack.writeBitmapLookupTable' was enabled by default.

As a result, we can clean up many of our bitmap-related performance
tests. Many of the relevant performance tests look something like:

    test_it () {
      test_expect_success 'setup pack.writeBitmapLookupTable' '
        git config pack.writeBitmapLookupTable '"$1"'
      '

      # ...
    }

    test_it true
    test_it false

, where the two invocations of 'test_it' run the tests with and without
bitmap lookup tables enabled.

But now that lookup tables are enabled by default and have proven to be
a performance win, let's avoid benchmarking what is now an uncommon and
non-default scenario.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/perf/p5310-pack-bitmaps.sh

@@ -4,7 +4,6 @@ test_description='Tests pack performance using bitmaps'
 . ./perf-lib.sh
 . "${TEST_DIRECTORY}/perf/lib-bitmap.sh"
 
-test_lookup_pack_bitmap () {
 test_expect_success 'start the test from scratch' '
 	rm -rf * .git
 '
@@ -27,14 +26,6 @@ test_lookup_pack_bitmap () {
 	git tag --message="tag pointing to HEAD" perf-tag HEAD
 '
 
-	test_perf "enable lookup table: $1" '
-		git config pack.writeBitmapLookupTable '"$1"'
-	'
-
 test_pack_bitmap
-}
-
-test_lookup_pack_bitmap false
-test_lookup_pack_bitmap true
 
 test_done

t/perf/p5311-pack-bitmaps-fetch.sh

@@ -3,7 +3,6 @@
 test_description='performance of fetches from bitmapped packs'
 . ./perf-lib.sh
 
-test_fetch_bitmaps () {
 test_expect_success 'setup test directory' '
 	rm -fr * .git
 '
@@ -12,7 +11,6 @@ test_fetch_bitmaps () {
 
 test_expect_success 'create bitmapped server repo' '
 	git config pack.writebitmaps true &&
-		git config pack.writeBitmapLookupTable '"$1"' &&
 	git repack -ad
 '
 
@@ -32,7 +30,7 @@ test_fetch_bitmaps () {
 		} >revs
 	'
 
-		test_perf "server $title (lookup=$1)" '
+	test_perf "server $title" '
 		git pack-objects --stdout --revs \
 				--thin --delta-base-offset \
 				<revs >tmp.pack
@@ -42,13 +40,9 @@ test_fetch_bitmaps () {
 		test_file_size tmp.pack
 	'
 
-		test_perf "client $title (lookup=$1)" '
+	test_perf "client $title" '
 		git index-pack --stdin --fix-thin <tmp.pack
 	'
 done
-}
-
-test_fetch_bitmaps true
-test_fetch_bitmaps false
 
 test_done

t/perf/p5326-multi-pack-bitmaps.sh

@@ -4,10 +4,7 @@ test_description='Tests performance using midx bitmaps'
 . ./perf-lib.sh
 . "${TEST_DIRECTORY}/perf/lib-bitmap.sh"
 
-test_bitmap () {
-	local enabled="$1"
-
-	test_expect_success "remove existing repo (lookup=$enabled)" '
+test_expect_success "remove existing repo" '
 	rm -fr * .git
 '
 
@@ -19,25 +16,21 @@ test_bitmap () {
 	git tag --message="tag pointing to HEAD" perf-tag HEAD
 '
 
-	test_expect_success "use lookup table: $enabled" '
-		git config pack.writeBitmapLookupTable '"$enabled"'
-	'
-
-	test_expect_success "start with bitmapped pack (lookup=$enabled)" '
+test_expect_success "start with bitmapped pack" '
 	git repack -adb
 '
 
-	test_perf "setup multi-pack index (lookup=$enabled)" '
+test_perf "setup multi-pack index" '
 	git multi-pack-index write --bitmap
 '
 
-	test_expect_success "drop pack bitmap (lookup=$enabled)" '
+test_expect_success "drop pack bitmap" '
 	rm -f .git/objects/pack/pack-*.bitmap
 '
 
 test_full_bitmap
 
-	test_expect_success "create partial bitmap state (lookup=$enabled)" '
+test_expect_success "create partial bitmap state" '
 	# pick a commit to represent the repo tip in the past
 	cutoff=$(git rev-list HEAD~100 -1) &&
 	orig_tip=$(git rev-parse HEAD) &&
@@ -59,9 +52,5 @@ test_bitmap () {
 '
 
 test_partial_bitmap
-}
-
-test_bitmap false
-test_bitmap true
 
 test_done

t/perf/p5333-pseudo-merge-bitmaps.sh

@@ -11,7 +11,6 @@ test_expect_success 'setup' '
 		-c bitmapPseudoMerge.all.threshold=now \
 		-c bitmapPseudoMerge.all.stableThreshold=never \
 		-c bitmapPseudoMerge.all.maxMerges=64 \
-		-c pack.writeBitmapLookupTable=true \
 		repack -adb
 '