Skip to content

Commit 27d578d

Browse files
peffgitster
authored andcommitted
t: annotate !PTHREADS tests with !FAIL_PREREQS
Some tests in t5300 and t7810 expect us to complain about a "--threads" argument when Git is compiled without pthread support. Running these under GIT_TEST_FAIL_PREREQS produces a confusing failure: we pretend to the tests that there is no pthread support, so they expect the warning, but of course the actual build is perfectly happy to respect the --threads argument. We never noticed before the recent a926c4b (tests: remove most uses of C_LOCALE_OUTPUT, 2021-02-11), because the tests also were marked as requiring the C_LOCALE_OUTPUT prerequisite. Which means they'd never have run in FAIL_PREREQS mode, since it would always pretend that the locale prereq was not satisfied. These tests can't possibly work in this mode; it is a mismatch between what the tests expect and what the build was told to do. So let's just mark them to be skipped, using the special prereq introduced by dfe1a17 (tests: add a special setup where prerequisites fail, 2019-05-13). Reported-by: Son Luong Ngoc <[email protected]> Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a5828ae commit 27d578d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

t/t5300-pack-object.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,8 @@ test_expect_success 'index-pack --strict <pack> works in non-repo' '
427427
test_path_is_file foo.idx
428428
'
429429

430-
test_expect_success !PTHREADS 'index-pack --threads=N or pack.threads=N warns when no pthreads' '
430+
test_expect_success !PTHREADS,!FAIL_PREREQS \
431+
'index-pack --threads=N or pack.threads=N warns when no pthreads' '
431432
test_must_fail git index-pack --threads=2 2>err &&
432433
grep ^warning: err >warnings &&
433434
test_line_count = 1 warnings &&
@@ -445,7 +446,8 @@ test_expect_success !PTHREADS 'index-pack --threads=N or pack.threads=N warns wh
445446
grep -F "no threads support, ignoring pack.threads" err
446447
'
447448

448-
test_expect_success !PTHREADS 'pack-objects --threads=N or pack.threads=N warns when no pthreads' '
449+
test_expect_success !PTHREADS,!FAIL_PREREQS \
450+
'pack-objects --threads=N or pack.threads=N warns when no pthreads' '
449451
git pack-objects --threads=2 --stdout --all </dev/null >/dev/null 2>err &&
450452
grep ^warning: err >warnings &&
451453
test_line_count = 1 warnings &&

t/t7810-grep.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,8 @@ do
969969
"
970970
done
971971

972-
test_expect_success !PTHREADS 'grep --threads=N or pack.threads=N warns when no pthreads' '
972+
test_expect_success !PTHREADS,!FAIL_PREREQS \
973+
'grep --threads=N or pack.threads=N warns when no pthreads' '
973974
git grep --threads=2 Hello hello_world 2>err &&
974975
grep ^warning: err >warnings &&
975976
test_line_count = 1 warnings &&

0 commit comments

Comments
 (0)