On 12/10/2019 5:13 AM, SZEDER Gábor wrote: > On Mon, Dec 09, 2019 at 04:10:01PM +0000, Derrick Stolee via GitGitGadget wrote: >> From: Derrick Stolee <dstolee@xxxxxxxxxxxxx> >> >> The fsmonitor feature allows an external tool such as watchman to >> monitor the working directory. The direct test >> t7619-status-fsmonitor.sh provides some coverage, but it would be >> better to run the entire test suite with watchman enabled. This >> would provide more confidence that the feature is working as >> intended. >> >> The fsmonitor feature struggles with submodules. Disable the >> GIT_TEST_FSMONITOR environment variable before running tests with >> a lot of submodule interactions. >> >> Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> >> --- >> t/t3404-rebase-interactive.sh | 1 + >> t/t3600-rm.sh | 1 + >> t/t4060-diff-submodule-option-diff-format.sh | 3 +++ >> t/t5526-fetch-submodules.sh | 2 ++ >> t/t7402-submodule-rebase.sh | 3 +++ >> t/t7406-submodule-update.sh | 2 ++ >> t/t7506-status-submodule.sh | 3 +++ >> t/t7508-status.sh | 3 +++ >> 8 files changed, 18 insertions(+) >> >> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh >> index 461dd539ff..9dc7d1aefb 100755 >> --- a/t/t3404-rebase-interactive.sh >> +++ b/t/t3404-rebase-interactive.sh >> @@ -697,6 +697,7 @@ test_expect_success 'do "noop" when there is nothing to cherry-pick' ' >> ' >> >> test_expect_success 'submodule rebase setup' ' >> + GIT_TEST_FSMONITOR="" && > > This disables GIT_TEST_FSMONITOR for the remainder of the test script, > but there are still a lot of non-submodule-specific tests to run. ... >> diff --git a/t/t7508-status.sh b/t/t7508-status.sh >> index 4e676cdce8..bf0487632d 100755 >> --- a/t/t7508-status.sh >> +++ b/t/t7508-status.sh >> @@ -846,6 +846,9 @@ test_expect_success 'status refreshes the index' ' >> test_cmp expect output >> ' >> >> +# fsmonitor does not work well with submodules >> +GIT_TEST_FSMONITOR="" >> + > > Likewise. Would it make sense to wrap the tests in a subshell without increasing the tabbing inside the subshell? I can comment the beginning of the subshell that we are disabling the variable for a specific list of tests and the subshell can be removed after the proper fixes make it work. Thanks, -Stolee
