summaryrefslogtreecommitdiff
path: root/t/perf/p0004-lazy-init-name-hash.sh
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2017-05-13 16:03:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-16 02:11:56 (GMT)
commitc5a915739386a59e00c95632801f43d4740a64aa (patch)
treebb760bad3467039af2ff3ea4d59a8397d21ec2e7 /t/perf/p0004-lazy-init-name-hash.sh
parent7b0d409eb28c4c92fa292dfc3ac468cb0f42d2bf (diff)
downloadgit-c5a915739386a59e00c95632801f43d4740a64aa.zip
git-c5a915739386a59e00c95632801f43d4740a64aa.tar.gz
git-c5a915739386a59e00c95632801f43d4740a64aa.tar.bz2
p0004: don't error out if test repo is too small
Repositories with less than 4000 entries are always handled using a single thread, causing test-lazy-init-name-hash --multi to error out. Don't abort the whole test script in that case, but simply skip the multi-threaded performance check. We can still use it to compare the single-threaded speed of different versions in that case. Signed-off-by: Rene Scharfe <l.s.r@web.de> Acked-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/perf/p0004-lazy-init-name-hash.sh')
-rwxr-xr-xt/perf/p0004-lazy-init-name-hash.sh13
1 files changed, 8 insertions, 5 deletions
diff --git a/t/perf/p0004-lazy-init-name-hash.sh b/t/perf/p0004-lazy-init-name-hash.sh
index 3c2135a..8de5a98 100755
--- a/t/perf/p0004-lazy-init-name-hash.sh
+++ b/t/perf/p0004-lazy-init-name-hash.sh
@@ -8,10 +8,13 @@ test_checkout_worktree
test_expect_success 'verify both methods build the same hashmaps' '
test-lazy-init-name-hash --dump --single >out.single &&
- test-lazy-init-name-hash --dump --multi >out.multi &&
- sort <out.single >sorted.single &&
- sort <out.multi >sorted.multi &&
- test_cmp sorted.single sorted.multi
+ if test-lazy-init-name-hash --dump --multi >out.multi
+ then
+ test_set_prereq REPO_BIG_ENOUGH_FOR_MULTI &&
+ sort <out.single >sorted.single &&
+ sort <out.multi >sorted.multi &&
+ test_cmp sorted.single sorted.multi
+ fi
'
test_expect_success 'calibrate' '
@@ -46,7 +49,7 @@ test_perf "single-threaded, $desc" "
test-lazy-init-name-hash --single --count=$count
"
-test_perf "multi-threaded, $desc" "
+test_perf REPO_BIG_ENOUGH_FOR_MULTI "multi-threaded, $desc" "
test-lazy-init-name-hash --multi --count=$count
"