From patchwork Mon Dec 9 16:10:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11279691 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 09D5E188B for ; Mon, 9 Dec 2019 16:10:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCAC9207FF for ; Mon, 9 Dec 2019 16:10:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GrFV/zwX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726691AbfLIQKQ (ORCPT ); Mon, 9 Dec 2019 11:10:16 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38722 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726538AbfLIQKL (ORCPT ); Mon, 9 Dec 2019 11:10:11 -0500 Received: by mail-wm1-f65.google.com with SMTP id p17so15563607wmi.3 for ; Mon, 09 Dec 2019 08:10:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=WDklD2JX9l7ontB7B0w1M/kSgIVjukgaGNJHtkfp5Z0=; b=GrFV/zwXDzIRf8y1rpjUxGdKEfQcC6RscumegpjS5llZFT3gqNcFAwJLFHh0UXKdGz QdAA0r1+iLerIQdtN8TLJZYC+2FrMCDhiNUL6mGhf83/+3sQm+z5VIgRjaILOdRPVwqQ xVgESzYXZ2c+GsF0MAoC/657h8nXi+PAh1cvIF+Y+xAvyB9Vj8dYYEzEB2IyPZYZymFn wvtW0VZPkQzsg7wWtu0M9uoZRUPJfetkHF4olOKxRjBNVBvadE7zMhd7Q31GTpZIhtPb Q70yyZ/jawtbDtw8x++mFF3kz+gdhzuUCQSJ3OJxqhFzpt9FqArpZFKtSxlIOXcHze9k b4GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=WDklD2JX9l7ontB7B0w1M/kSgIVjukgaGNJHtkfp5Z0=; b=Q5mUlZ/+IeO/E/bm3SPvnBuz4dWpMUnBUYrAAnQZ5luveGYSSQFeFOnscnVVnr/xyz C69C+JSVXFrW17+V+cBCa9LZ6LtdzH1StlcPLvWtRlmplYwhzssghRJsujT8+JLwuA1+ eLLnv4ZXMJtCpwDRzXkQjbfvQtTmwp56m9pzJC/UxNf25p2hI2//Zn+wU+hBHpSjP03j VEV7IPQCK0EWvxqUxi5QLhb+Jn7HE+mXVH1wTW8zP2PTjrr9f+dqJDvvjbbHSF8ZHjbg a2MITDBG5nIJK9UmatjqDTybGtzcfn30kxVZ/uwv5ZIRxnQPwXEfIIxHM4Aam6xSBLhx Ifuw== X-Gm-Message-State: APjAAAU55/Qkh2tej7QLJHMGYnOVaIu5c6/Xls8l6EVByPDETyETLWzK ULsVgkWvZY3/ztpH/5NX3sopOORY X-Google-Smtp-Source: APXvYqzxUcbAC6OAIap00p/D2CCeuLOHZAfTEw7p2i4jI+1l4m5ndjp/TYfahmJzuy9HqNeTewBL7g== X-Received: by 2002:a1c:dc08:: with SMTP id t8mr26476413wmg.139.1575907809088; Mon, 09 Dec 2019 08:10:09 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a186sm196157wmd.41.2019.12.09.08.10.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Dec 2019 08:10:08 -0800 (PST) Message-Id: In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Mon, 09 Dec 2019 16:10:01 +0000 Subject: [PATCH v2 5/8] tests: disable fsmonitor in submodule tests Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: szeder.dev@gmail.com, ukshah2@illinois.edu, Kevin.Willford@microsoft.com, Derrick Stolee , Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee 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 --- 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="" && git checkout A && mkdir sub && ( diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 66282a720e..64269bd89d 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -355,6 +355,7 @@ test_expect_success 'rm succeeds when given a directory with a trailing /' ' ' test_expect_success 'rm of a populated submodule with different HEAD fails unless forced' ' + GIT_TEST_FSMONITOR="" && git reset --hard && git submodule update && git -C submod checkout HEAD^ && 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 &&