Merge branch 'vd/fix-perf-tests'

gitster · gitster · commit 25402204fe00 · 2022-08-29T14:55:13.000-07:00
Rather trivial perf-test code fixes.

* vd/fix-perf-tests:
  p0006: fix 'read-tree' argument ordering
  p0004: fix prereq declaration
diff --git a/t/perf/p0004-lazy-init-name-hash.sh b/t/perf/p0004-lazy-init-name-hash.sh
@@ -49,7 +49,7 @@ test_perf "single-threaded, $desc" "
 	test-tool lazy-init-name-hash --single --count=$count
 "
 
-test_perf REPO_BIG_ENOUGH_FOR_MULTI "multi-threaded, $desc" "
+test_perf "multi-threaded, $desc" --prereq REPO_BIG_ENOUGH_FOR_MULTI "
 	test-tool lazy-init-name-hash --multi --count=$count
 "
 
diff --git a/t/perf/p0006-read-tree-checkout.sh b/t/perf/p0006-read-tree-checkout.sh
@@ -46,7 +46,7 @@ test_expect_success "setup repo" '
 '
 
 test_perf "read-tree br_base br_ballast ($nr_files)" '
-	git read-tree -m br_base br_ballast -n
+	git read-tree -n -m br_base br_ballast
 '
 
 test_perf "switch between br_base br_ballast ($nr_files)" '

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ test_perf "single-threaded, $desc" "`
`49`	`49`	`test-tool lazy-init-name-hash --single --count=$count`
`50`	`50`	`"`
`51`	`51`
`52`		`-test_perf REPO_BIG_ENOUGH_FOR_MULTI "multi-threaded, $desc" "`
	`52`	`+test_perf "multi-threaded, $desc" --prereq REPO_BIG_ENOUGH_FOR_MULTI "`
`53`	`53`	`test-tool lazy-init-name-hash --multi --count=$count`
`54`	`54`	`"`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ test_expect_success "setup repo" '`
`46`	`46`	`'`
`47`	`47`
`48`	`48`	`test_perf "read-tree br_base br_ballast ($nr_files)" '`
`49`		`- git read-tree -m br_base br_ballast -n`
	`49`	`+ git read-tree -n -m br_base br_ballast`
`50`	`50`	`'`
`51`	`51`
`52`	`52`	`test_perf "switch between br_base br_ballast ($nr_files)" '`