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>
This commit is contained in:
René Scharfe 2017-05-13 18:03:50 +02:00 committed by Junio C Hamano
parent 7b0d409eb2
commit c5a9157393

View file

@ -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
"