mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
pack-objects & index-pack: add test for --threads warning
Add a test for the warning that's emitted when --threads or pack.threads is provided under NO_PTHREADS=YesPlease. This uses the new PTHREADS prerequisite. The assertion for C_LOCALE_OUTPUT in the latter test is currently redundant, since unlike index-pack the pack-objects warnings aren't i18n'd. However they might be changed to be i18n'd in the future, and there's no harm in future-proofing the test. There's an existing bug in the implementation of pack-objects which this test currently tests for as-is. Details about the bug & the fix are included in a follow-up change. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
68c7d2761d
commit
967a3eaf43
|
@ -421,6 +421,42 @@ test_expect_success 'index-pack <pack> works in non-repo' '
|
|||
test_path_is_file foo.idx
|
||||
'
|
||||
|
||||
test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'index-pack --threads=N or pack.threads=N warns when no pthreads' '
|
||||
test_must_fail git index-pack --threads=2 2>err &&
|
||||
grep ^warning: err >warnings &&
|
||||
test_line_count = 1 warnings &&
|
||||
grep -F "no threads support, ignoring --threads=2" err &&
|
||||
|
||||
test_must_fail git -c pack.threads=2 index-pack 2>err &&
|
||||
grep ^warning: err >warnings &&
|
||||
test_line_count = 1 warnings &&
|
||||
grep -F "no threads support, ignoring pack.threads" err &&
|
||||
|
||||
test_must_fail git -c pack.threads=2 index-pack --threads=4 2>err &&
|
||||
grep ^warning: err >warnings &&
|
||||
test_line_count = 2 warnings &&
|
||||
grep -F "no threads support, ignoring --threads=4" err &&
|
||||
grep -F "no threads support, ignoring pack.threads" err
|
||||
'
|
||||
|
||||
test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack.threads=N warns when no pthreads' '
|
||||
git pack-objects --threads=2 --stdout --all </dev/null >/dev/null 2>err &&
|
||||
grep ^warning: err >warnings &&
|
||||
test_line_count = 1 warnings &&
|
||||
grep -F "no threads support, ignoring --threads" err &&
|
||||
|
||||
git -c pack.threads=2 pack-objects --stdout --all </dev/null >/dev/null 2>err &&
|
||||
grep ^warning: err >warnings &&
|
||||
test_must_fail test_line_count = 1 warnings &&
|
||||
grep -F "no threads support, ignoring pack.threads" err &&
|
||||
|
||||
git -c pack.threads=2 pack-objects --threads=4 --stdout --all </dev/null >/dev/null 2>err &&
|
||||
grep ^warning: err >warnings &&
|
||||
test_line_count = 2 warnings &&
|
||||
grep -F "no threads support, ignoring --threads" err &&
|
||||
grep -F "no threads support, ignoring pack.threads" err
|
||||
'
|
||||
|
||||
#
|
||||
# WARNING!
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue