From: "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Derrick Stolee <dstolee@microsoft.com>,
Junio C Hamano <gitster@pobox.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: [PATCH 08/11] tests: disable fsmonitor in submodule tests
Date: Thu, 21 Nov 2019 22:20:23 +0000 [thread overview]
Message-ID: <36f845cb7ee21443e7f20517968982222e775a6a.1574374826.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.466.git.1574374826.gitgitgadget@gmail.com>
From: Derrick Stolee <dstolee@microsoft.com>
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@microsoft.com>
---
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 +++
6 files changed, 16 insertions(+)
diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index 9dcb69df5c..017417790e 100755
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@ -15,6 +15,9 @@ This test tries to verify the sanity of --submodule=diff option of git diff.
# Tested non-UTF-8 encoding
test_encoding="ISO8859-1"
+# fsmonitor does not work well with submodules
+GIT_TEST_FSMONITOR=""
+
# String "added" in German (translated with Google Translate), encoded in UTF-8,
# used in sample commit log messages in add_file() function below.
added=$(printf "hinzugef\303\274gt")
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 63205dfdf9..fb346bff05 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -1,6 +1,8 @@
#!/bin/sh
# Copyright (c) 2010, Jens Lehmann
+GIT_TEST_FSMONITOR=""
+
test_description='Recursive "git fetch" for submodules'
. ./test-lib.sh
diff --git a/t/t7402-submodule-rebase.sh b/t/t7402-submodule-rebase.sh
index 8e32f19007..c78e9009cf 100755
--- a/t/t7402-submodule-rebase.sh
+++ b/t/t7402-submodule-rebase.sh
@@ -7,6 +7,9 @@ test_description='Test rebasing, stashing, etc. with submodules'
. ./test-lib.sh
+# fsmonitor does not work well with submodules
+GIT_TEST_FSMONITOR=""
+
test_expect_success setup '
echo file > file &&
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index c973278300..8d93aaef5f 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -11,6 +11,8 @@ submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
. ./test-lib.sh
+# fsmonitor does not work well with submodules
+GIT_TEST_FSMONITOR=""
compare_head()
{
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 08629a6e70..1a716f2c2a 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -4,6 +4,9 @@ test_description='git status for submodule'
. ./test-lib.sh
+# fsmonitor does not work well with submodules
+GIT_TEST_FSMONITOR=""
+
test_create_repo_with_commit () {
test_create_repo "$1" &&
(
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=""
+
test_expect_success 'setup status submodule summary' '
test_create_repo sm && (
cd sm &&
--
gitgitgadget
next prev parent reply other threads:[~2019-11-21 22:20 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 22:20 [PATCH 00/11] Improve testability with GIT_TEST_FSMONITOR Derrick Stolee via GitGitGadget
2019-11-21 22:20 ` [PATCH 01/11] fsmonitor: disable in a bare repo Derrick Stolee via GitGitGadget
2019-11-21 23:18 ` Denton Liu
2019-11-22 1:57 ` Derrick Stolee
2019-11-21 22:20 ` [PATCH 02/11] fsmonitor: do not output to stderr for tests Derrick Stolee via GitGitGadget
2019-11-21 22:20 ` [PATCH 03/11] t1301-shared-repo.sh: disable FSMONITOR Derrick Stolee via GitGitGadget
2019-11-21 22:20 ` [PATCH 04/11] t1510-repo-setup.sh: disable fsmonitor if no .git dir Derrick Stolee via GitGitGadget
2019-11-21 22:20 ` [PATCH 05/11] fsmonitor: disable fsmonitor with worktrees Derrick Stolee via GitGitGadget
2019-11-21 22:20 ` [PATCH 06/11] t3030-merge-recursive.sh: disable fsmonitor when tweaking GIT_WORK_TREE Derrick Stolee via GitGitGadget
2019-11-21 22:20 ` [PATCH 07/11] t3600-rm.sh: disable fsmonitor when deleting populated submodule Derrick Stolee via GitGitGadget
2019-11-21 22:20 ` Derrick Stolee via GitGitGadget [this message]
2019-11-21 22:20 ` [PATCH 09/11] t7063: disable fsmonitor with status cache Derrick Stolee via GitGitGadget
2019-11-21 22:20 ` [PATCH 10/11] t7519: disable external GIT_TEST_FSMONITOR variable Derrick Stolee via GitGitGadget
2019-11-21 22:20 ` [PATCH 11/11] test-lib: clear watchman watches at test completion Derrick Stolee via GitGitGadget
2019-11-22 1:06 ` SZEDER Gábor
2019-12-09 14:12 ` Derrick Stolee
2019-12-09 23:40 ` SZEDER Gábor
2019-12-10 1:43 ` Derrick Stolee
2019-12-09 16:09 ` [PATCH v2 0/8] Improve testability with GIT_TEST_FSMONITOR Derrick Stolee via GitGitGadget
2019-12-09 16:09 ` [PATCH v2 1/8] fsmonitor: disable in a bare repo Derrick Stolee via GitGitGadget
2019-12-10 9:46 ` SZEDER Gábor
2019-12-09 16:09 ` [PATCH v2 2/8] fsmonitor: do not output to stderr for tests Derrick Stolee via GitGitGadget
2019-12-09 16:09 ` [PATCH v2 3/8] t1301-shared-repo.sh: disable FSMONITOR Derrick Stolee via GitGitGadget
2019-12-10 9:43 ` SZEDER Gábor
2019-12-09 16:10 ` [PATCH v2 4/8] t3030-merge-recursive.sh: disable fsmonitor when tweaking GIT_WORK_TREE Derrick Stolee via GitGitGadget
2019-12-10 10:07 ` SZEDER Gábor
2019-12-10 13:45 ` Derrick Stolee
2019-12-10 14:57 ` SZEDER Gábor
2019-12-10 15:07 ` SZEDER Gábor
2020-01-23 15:45 ` Derrick Stolee
2019-12-09 16:10 ` [PATCH v2 5/8] tests: disable fsmonitor in submodule tests Derrick Stolee via GitGitGadget
2019-12-10 10:13 ` SZEDER Gábor
2019-12-10 13:57 ` Derrick Stolee
2019-12-09 16:10 ` [PATCH v2 6/8] t7063: disable fsmonitor with status cache Derrick Stolee via GitGitGadget
2019-12-09 16:10 ` [PATCH v2 7/8] t7519: disable external GIT_TEST_FSMONITOR variable Derrick Stolee via GitGitGadget
2019-12-09 16:10 ` [PATCH v2 8/8] test-lib: clear watchman watches at test completion Derrick Stolee via GitGitGadget
2019-12-09 22:52 ` Junio C Hamano
2019-12-10 1:49 ` Derrick Stolee
2019-12-10 5:20 ` Junio C Hamano
2019-12-10 13:51 ` Derrick Stolee
2019-12-10 14:09 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=36f845cb7ee21443e7f20517968982222e775a6a.1574374826.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.