Skip to content

Commit 36f845c

Browse files
committed
tests: disable fsmonitor in submodule tests
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 <[email protected]>
1 parent d0b212c commit 36f845c

6 files changed

+16
-0
lines changed

t/t4060-diff-submodule-option-diff-format.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ This test tries to verify the sanity of --submodule=diff option of git diff.
1515
# Tested non-UTF-8 encoding
1616
test_encoding="ISO8859-1"
1717

18+
# fsmonitor does not work well with submodules
19+
GIT_TEST_FSMONITOR=""
20+
1821
# String "added" in German (translated with Google Translate), encoded in UTF-8,
1922
# used in sample commit log messages in add_file() function below.
2023
added=$(printf "hinzugef\303\274gt")

t/t5526-fetch-submodules.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/sh
22
# Copyright (c) 2010, Jens Lehmann
33

4+
GIT_TEST_FSMONITOR=""
5+
46
test_description='Recursive "git fetch" for submodules'
57

68
. ./test-lib.sh

t/t7402-submodule-rebase.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ test_description='Test rebasing, stashing, etc. with submodules'
77

88
. ./test-lib.sh
99

10+
# fsmonitor does not work well with submodules
11+
GIT_TEST_FSMONITOR=""
12+
1013
test_expect_success setup '
1114
1215
echo file > file &&

t/t7406-submodule-update.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
1111

1212
. ./test-lib.sh
1313

14+
# fsmonitor does not work well with submodules
15+
GIT_TEST_FSMONITOR=""
1416

1517
compare_head()
1618
{

t/t7506-status-submodule.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ test_description='git status for submodule'
44

55
. ./test-lib.sh
66

7+
# fsmonitor does not work well with submodules
8+
GIT_TEST_FSMONITOR=""
9+
710
test_create_repo_with_commit () {
811
test_create_repo "$1" &&
912
(

t/t7508-status.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,9 @@ test_expect_success 'status refreshes the index' '
846846
test_cmp expect output
847847
'
848848

849+
# fsmonitor does not work well with submodules
850+
GIT_TEST_FSMONITOR=""
851+
849852
test_expect_success 'setup status submodule summary' '
850853
test_create_repo sm && (
851854
cd sm &&

0 commit comments

Comments
 (0)