git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH] mingw: make is_hidden tests in t0001/t5611 more robust
Date: Wed, 08 Apr 2020 19:34:34 +0000	[thread overview]
Message-ID: <pull.603.git.1586374474512.gitgitgadget@gmail.com> (raw)

From: Johannes Schindelin <johannes.schindelin@gmx.de>

We should not actually expect the first `attrib.exe` in the PATH to
be the one we are looking for. Or that it is in the PATH, for that
matter.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
    Make the tests that test core.hideDotFiles more robust
    
    We have this feature on Windows where the files starting with a dot can
    be marked hidden (whether a file is hidden by default or not is a matter
    of naming convention on Unix, but it is an explicit flag on Windows).
    This patch improves the regression tests of this feature, and it has
    been carried in Git for Windows for over three years.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-603%2Fdscho%2Frobustify-is-hidden-tests-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-603/dscho/robustify-is-hidden-tests-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/603

 t/t0001-init.sh         | 2 +-
 t/t5611-clone-config.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 26f82063267..2456688b281 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -395,7 +395,7 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
 # Tests for the hidden file attribute on windows
 is_hidden () {
 	# Use the output of `attrib`, ignore the absolute path
-	case "$(attrib "$1")" in *H*?:*) return 0;; esac
+	case "$("$SYSTEMROOT"/system32/attrib "$1")" in *H*?:*) return 0;; esac
 	return 1
 }
 
diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh
index 60c1ba951b7..87b8073cd74 100755
--- a/t/t5611-clone-config.sh
+++ b/t/t5611-clone-config.sh
@@ -95,7 +95,7 @@ test_expect_success 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>' '
 # Tests for the hidden file attribute on windows
 is_hidden () {
 	# Use the output of `attrib`, ignore the absolute path
-	case "$(attrib "$1")" in *H*?:*) return 0;; esac
+	case "$("$SYSTEMROOT"/system32/attrib "$1")" in *H*?:*) return 0;; esac
 	return 1
 }
 

base-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775
-- 
gitgitgadget

             reply	other threads:[~2020-04-08 19:34 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-08 19:34 Johannes Schindelin via GitGitGadget [this message]
2020-04-08 21:59 ` Junio C Hamano
2020-04-09 20:11   ` [PATCH 0/2] make "is_hidden" even " Junio C Hamano
2020-04-09 20:11     ` [PATCH 1/2] mingw: refactor test_path_is_hidden out to t/test-lib-functions.sh Junio C Hamano
2020-04-09 20:11     ` [PATCH 2/2] t: protect against use of test_path_is_hidden outside MINGW Junio C Hamano
2020-04-10 11:03 ` [PATCH v2 0/3] Make the tests that test core.hideDotFiles more robust Johannes Schindelin via GitGitGadget
2020-04-10 11:03   ` [PATCH v2 1/3] t: consolidate the `is_hidden` functions Johannes Schindelin via GitGitGadget
2020-04-10 11:03   ` [PATCH v2 2/3] mingw: make test_path_is_hidden tests in t0001/t5611 more robust Johannes Schindelin via GitGitGadget
2020-04-10 11:03   ` [PATCH v2 3/3] t: fix casing of the operating system `Windows` Johannes Schindelin via GitGitGadget
2020-04-10 11:14   ` [PATCH v2 0/3] Make the tests that test core.hideDotFiles more robust Junio C Hamano
2020-04-11 13:40   ` [PATCH v3 " Johannes Schindelin via GitGitGadget
2020-04-11 13:40     ` [PATCH v3 1/3] t: consolidate the `is_hidden` functions Johannes Schindelin via GitGitGadget
2020-04-11 13:40     ` [PATCH v3 2/3] mingw: make test_path_is_hidden more robust Johannes Schindelin via GitGitGadget
2020-04-11 13:40     ` [PATCH v3 3/3] t: restrict `is_hidden` to be called only on Windows Johannes Schindelin via GitGitGadget
2020-04-11 21:27     ` [PATCH v3 0/3] Make the tests that test core.hideDotFiles more robust Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=pull.603.git.1586374474512.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    /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.
Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).