From: Adam Dinwoodie <adam@dinwoodie.org>
To: Git Mailing List <git@vger.kernel.org>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Emily Shaffer" <emilyshaffer@google.com>
Subject: [PATCH] t1800: correct test to handle Cygwin
Date: Thu, 1 Sep 2022 18:39:42 +0100 [thread overview]
Message-ID: <20220901173942.abolcr4aa5gixncm@lucy.dinwoodie.org> (raw)
On Cygwin, when failing to spawn a process using start_command, Git
outputs the same error as on Linux systems, rather than using the
GIT_WINDOWS_NATIVE-specific error output. The WINDOWS test prerequisite
is set in both Cygwin and native Windows environments, which means it's
not appropriate to use to anticipate the error output from
start_command. Instead, use the MINGW test prerequisite, which is only
set for Git in native Windows environments, and not for Cygwin.
Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org>
---
The job of setting Cygwin up to get Git CI builds, either as part of the
main CI builds or as something using separate automation, is rapidly
rising up my when-I-have-the-time to-do list...
t/t1800-hook.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t1800-hook.sh b/t/t1800-hook.sh
index 64096adac7..fae8b2faf9 100755
--- a/t/t1800-hook.sh
+++ b/t/t1800-hook.sh
@@ -159,7 +159,7 @@ test_expect_success 'git hook run a hook with a bad shebang' '
# TODO: We should emit the same (or at least a more similar)
# error on Windows and !Windows. See the OS-specific code in
# start_command()
- if test_have_prereq !WINDOWS
+ if test_have_prereq !MINGW
then
cat >expect <<-\EOF
fatal: cannot run bad-hooks/test-hook: ...
--
2.37.2
next reply other threads:[~2022-09-01 17:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 17:39 Adam Dinwoodie [this message]
2022-09-01 18:32 ` [PATCH] t1800: correct test to handle Cygwin Junio C Hamano
2022-09-02 1:55 ` Đoàn Trần Công Danh
2022-09-02 12:22 ` Johannes Schindelin
2022-09-07 20:49 ` Junio C Hamano
2022-09-07 20:57 ` rsbecker
2022-09-13 21:08 ` Adam Dinwoodie
2022-09-13 21:33 ` Junio C Hamano
2022-09-15 7:57 ` [PATCH v2] " Adam Dinwoodie
2022-09-15 8:51 ` rsbecker
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=20220901173942.abolcr4aa5gixncm@lucy.dinwoodie.org \
--to=adam@dinwoodie.org \
--cc=avarab@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
/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 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 NNTP newsgroup(s).