From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Matheus Tavares <matheus.bernardino@usp.br>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] parallel-checkout: use grep -c to count workers in tests
Date: Sat, 5 Jun 2021 14:27:47 +0200 [thread overview]
Message-ID: <eb4bcd4c-e6d2-cbeb-8951-cf22b9d3d5fe@web.de> (raw)
The parallel checkout tests fail when run with /bin/dash on MacOS 11.4,
reporting the following error:
./t2080-parallel-checkout-basics.sh: 33: local: 0: bad variable name
This seems to be caused by a bug in dash, which doesn't like the pipe
into wc for some reason. We can work around it and make the test
slightly shorter and faster by having grep do the counting, though, so
let's do that.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
Reduced test case for underlying dash issue:
$ dash -c 'foo () { local bar=$(echo baz | wc); }; foo'
dash: 1: local: 1: bad variable name
The pipe is not even required to trigger the issue:
$ dash -c 'foo () { local bar=$(wc /dev/null); }; foo'
dash: 1: local: 0: bad variable name
Turning wc into a function calms the shell:
$ dash -c 'foo () { local bar=$(echo baz | wc); }; wc () { :; }; foo'
Setting a global variable also works fine:
$ dash -c 'foo () { bar=$(echo baz | wc); }; foo'
t/lib-parallel-checkout.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/lib-parallel-checkout.sh b/t/lib-parallel-checkout.sh
index 21f5759732..145276eb4c 100644
--- a/t/lib-parallel-checkout.sh
+++ b/t/lib-parallel-checkout.sh
@@ -27,7 +27,7 @@ test_checkout_workers () {
rm -f "$trace_file" &&
GIT_TRACE2="$(pwd)/$trace_file" "$@" 2>&8 &&
- local workers=$(grep "child_start\[..*\] git checkout--worker" "$trace_file" | wc -l) &&
+ local workers=$(grep -c "child_start\[..*\] git checkout--worker" <"$trace_file") &&
test $workers -eq $expected_workers &&
rm "$trace_file"
} 8>&2 2>&4
--
2.31.1
next reply other threads:[~2021-06-05 12:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-05 12:27 René Scharfe [this message]
2021-06-05 14:31 ` [PATCH] parallel-checkout: use grep -c to count workers in tests Matheus Tavares Bernardino
2021-06-05 15:20 ` René Scharfe
2021-06-05 15:30 ` René Scharfe
2021-06-05 18:11 ` [PATCH v2] parallel-checkout: avoid dash local bug " René Scharfe
2021-06-05 19:09 ` SZEDER Gábor
2021-06-06 1:01 ` René Scharfe
2021-06-05 19:56 ` Ævar Arnfjörð Bjarmason
2021-06-05 22:17 ` Matheus Tavares Bernardino
2021-06-05 22:21 ` Matheus Tavares Bernardino
2021-06-06 1:01 ` René Scharfe
2021-06-06 1:28 ` Junio C Hamano
2021-06-06 1:01 ` [PATCH v3] " René Scharfe
2021-06-06 1:41 ` 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=eb4bcd4c-e6d2-cbeb-8951-cf22b9d3d5fe@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=matheus.bernardino@usp.br \
/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).