[PATCH v3 26/26] Disable file-watcher with system inotify on some tests
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Feb 3, 2014, 04:29 UTC
- Message-ID
- <1391401754-15347-27-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1391401754-15347-1-git-send-email-pclouds@gmail.com>
When file watcher is active via GIT_TEST_WATCHER_PATH, `ls-files -v` output may be different (e.g. "H" becomes "W"). Disable file watcher in those cases.
We could make ls-files turn 'W' back to 'H' for these cases, but not sure it's worth the effort. The intention of running with GIT_TEST_WATCHER_PATH is to exercise file watcher in somewhat real scenarios and the remaining tests are more than enough for that.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- t/t1011-read-tree-sparse-checkout.sh | 2 ++ t/t2104-update-index-skip-worktree.sh | 2 ++ t/t7011-skip-worktree-reading.sh | 2 ++ t/t7012-skip-worktree-writing.sh | 2 ++ 4 files changed, 8 insertions(+)
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh index 0c74bee..00e92bc 100755 --- a/t/t1011-read-tree-sparse-checkout.sh +++ b/t/t1011-read-tree-sparse-checkout.sh @@ -14,6 +14,8 @@ test_description='sparse checkout tests . ./test-lib.sh . "$TEST_DIRECTORY"/lib-read-tree.sh +unset GIT_TEST_WATCHER_PATH + test_expect_success 'setup' ' cat >expected <<-\EOF && 100644 77f0ba1734ed79d12881f81b36ee134de6a3327b 0 init.t diff --git a/t/t2104-update-index-skip-worktree.sh b/t/t2104-update-index-skip-worktree.sh index 1d0879b..2b93c58 100755 --- a/t/t2104-update-index-skip-worktree.sh +++ b/t/t2104-update-index-skip-worktree.sh @@ -7,6 +7,8 @@ test_description='skip-worktree bit test' . ./test-lib.sh +unset GIT_TEST_WATCHER_PATH + cat >expect.full <<EOF H 1 H 2 diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh index 88d60c1..2242718 100755 --- a/t/t7011-skip-worktree-reading.sh +++ b/t/t7011-skip-worktree-reading.sh @@ -7,6 +7,8 @@ test_description='skip-worktree bit test' . ./test-lib.sh +unset GIT_TEST_WATCHER_PATH + cat >expect.full <<EOF H 1 H 2 diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh index 9ceaa40..c8e0eb5 100755 --- a/t/t7012-skip-worktree-writing.sh +++ b/t/t7012-skip-worktree-writing.sh @@ -7,6 +7,8 @@ test_description='test worktree writing operations when skip-worktree is used' . ./test-lib.sh +unset GIT_TEST_WATCHER_PATH + test_expect_success 'setup' ' test_commit init && echo modified >> init.t &&
-- 1.8.5.2.240.g8478abd