From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH] p5311: handle spaces in wc(1) output
Date: Sat, 2 Oct 2021 22:33:18 +0200 [thread overview]
Message-ID: <a682e2c8-fecc-906e-0ff6-93de2b311d14@web.de> (raw)
Some implementations of wc(1) align their output with leading spaces,
even when just a single number is requested, e.g. with "wc -c". p5311
runs all tests successfully on such a platform, but fails to aggregate
their results and reports:
# passed all 33 test(s)
1..33
bad input line: 57144
Use the helper function test_file_size to get the number without any
spaces in a portable way to avoid the issue.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
t/perf/README | 2 +-
t/perf/p5311-pack-bitmaps-fetch.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/perf/README b/t/perf/README
index fb9127a66f..802402d738 100644
--- a/t/perf/README
+++ b/t/perf/README
@@ -190,7 +190,7 @@ shown in the aggregated output. For example:
'
test_size 'output size'
- wc -c <foo.out
+ test_file_size foo.out
'
might produce output like:
diff --git a/t/perf/p5311-pack-bitmaps-fetch.sh b/t/perf/p5311-pack-bitmaps-fetch.sh
index 47c3fd7581..ed0c7570d7 100755
--- a/t/perf/p5311-pack-bitmaps-fetch.sh
+++ b/t/perf/p5311-pack-bitmaps-fetch.sh
@@ -33,7 +33,7 @@ for days in 1 2 4 8 16 32 64 128; do
'
test_size "size $title" '
- wc -c <tmp.pack
+ test_file_size tmp.pack
'
test_perf "client $title" '
--
2.33.0
next reply other threads:[~2021-10-02 20:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-02 20:33 René Scharfe [this message]
2021-10-03 5:14 ` [PATCH] p5311: handle spaces in wc(1) output Taylor Blau
2021-10-03 8:04 ` Ævar Arnfjörð Bjarmason
2021-10-04 16:16 ` Junio C Hamano
2021-10-04 7:43 ` Jeff King
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=a682e2c8-fecc-906e-0ff6-93de2b311d14@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).