From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] mingw: make is_hidden tests in t0001/t5611 more robust
Date: Wed, 08 Apr 2020 14:59:55 -0700 [thread overview]
Message-ID: <xmqqmu7locys.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <pull.603.git.1586374474512.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Wed, 08 Apr 2020 19:34:34 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> 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
> }
I wondered if this (and the other one) want to be in test-lib but I
am on the fence. All three tests that call this helper in t0001 are
protected with MINGW prerequisite, but until I realized it, the call
to "attrib" (whether it is given as a full path or relies on $PATH
lookup) looked like a portability nightmare waiting to happen. It
would make it even worse if we moved the above as-is to test-lib, as
it is harder to see what the callers are doing once we did so.
With a change like this, however
is_hidden () {
if ! test_have_prereq MINGW
then
BUG "use of is_hidden outside MINGW prerequisite"
fi
case "$("$SYSTEMROOT"/system32/attrib "$1")" in
*H*?:*) return 0 ;;
*) return 1 ;;
esac
}
I think it is OK to consolidate these two copies into one in test-lib
Thanks.
> 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
next prev parent reply other threads:[~2020-04-08 22:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 19:34 [PATCH] mingw: make is_hidden tests in t0001/t5611 more robust Johannes Schindelin via GitGitGadget
2020-04-08 21:59 ` Junio C Hamano [this message]
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=xmqqmu7locys.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--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 public 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).