t/perf: fix broken tests

This series fixes two performance tests (p0004 & p0006) with syntax issues preventing them from running properly. Since these are pretty straightforward syntax bugs, the fixes don't seem to change the intended behavior of the tests.

Thanks!

* Victoria

Victoria Dye (2):
p0004: fix prereq declaration
p0006: fix 'read-tree' argument ordering

 t/perf/p0004-lazy-init-name-hash.sh | 2 +-
 t/perf/p0006-read-tree-checkout.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

base-commit: 795ea8776befc95ea2becd8020c7a284677b4161
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1330%2Fvdye%2Fbugfix%2Fperf-test-bugs-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1330/vdye/bugfix/perf-test-bugs-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1330

gitgitgadget

From: Victoria Dye <[email protected]>

Fix multi-threaded 'p0004' test's use of the 'REPO_BIG_ENOUGH_FOR_MULTI' prerequisite. Unlike normal 't/' tests, 't/perf/' tests need to have their prerequisites declared with the '--prereq' flag.

---
 t/perf/p0004-lazy-init-name-hash.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 1afc08fe7f1..85be14e4ddb 100755
@@ -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
 "
 

gitgitgadget

Thanks. It is unfortunate that we need to live with this seemingly unnecessary deviation.

From: Victoria Dye <[email protected]>

In the 'p0006' test "read-tree br_base br_ballast", move the '-n' flag used in 'git read-tree' ahead of its positional arguments.

---
 t/perf/p0006-read-tree-checkout.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 900b385c4bb..c481c012d2f 100755
@@ -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)" '

gitgitgadget