mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-13 08:57:56 -05:00
t7527: fix broken TAP output
Before running the tests in t7527 we first verify whether the fsmonitor even works, which seems to depend on the actual filesystem that is in use. The verification executes outside of any prerequisite or test body, so its stdout/stderr is not being redirected. The consequence of this is that any command that prints to stdout/stderr may break the TAP specification by printing invalid lines. And in fact we already do that, as git-init(1) prints the path to the created Git repository by default. Fix this issue by moving the logic into a lazy prerequisite. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
4d11b9c218
commit
9433efd64b
@@ -25,7 +25,8 @@ maybe_timeout () {
|
||||
"$@"
|
||||
fi
|
||||
}
|
||||
verify_fsmonitor_works () {
|
||||
|
||||
test_lazy_prereq FSMONITOR_WORKS '
|
||||
git init test_fsmonitor_smoke || return 1
|
||||
|
||||
GIT_TRACE_FSMONITOR="$PWD/smoke.trace" &&
|
||||
@@ -50,9 +51,9 @@ verify_fsmonitor_works () {
|
||||
ret=$?
|
||||
rm -rf test_fsmonitor_smoke smoke.trace
|
||||
return $ret
|
||||
}
|
||||
'
|
||||
|
||||
if ! verify_fsmonitor_works
|
||||
if ! test_have_prereq FSMONITOR_WORKS
|
||||
then
|
||||
skip_all="filesystem does not deliver fsmonitor events (container/overlayfs?)"
|
||||
test_done
|
||||
|
||||
Reference in New Issue
Block a user