diff options
| author |  René Scharfe <l.s.r@web.de> | 2021-06-06 03:01:57 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-06-06 10:40:26 +0900 |
| commit | ebee5580ca7e4dba06405713de14507909615966 (patch) | |
| tree | 6ab8278bbc876ac71f23e1e66151bbdcab1b108e /t/lib-parallel-checkout.sh | |
| parent | ci: run test round with parallel-checkout enabled (diff) | |
| download | tgif-ebee5580ca7e4dba06405713de14507909615966.tar.xz | |
parallel-checkout: avoid dash local bug in tests
Dash bug https://bugs.launchpad.net/ubuntu/+source/dash/+bug/139097
lets the shell erroneously perform field splitting on the expansion of a
command substitution during declaration of a local variable. It causes
the parallel-checkout tests to fail e.g. when running them with
/bin/dash on MacOS 11.4, where they error out like this:
./t2080-parallel-checkout-basics.sh: 33: local: 0: bad variable name
That's because the output of wc -l contains leading spaces and the
returned number of lines is treated as another variable to declare, i.e.
as in "local workers= 0".
Work around it by enclosing the command substitution in quotes.
Helped-by: Matheus Tavares Bernardino <matheus.bernardino@usp.br>
Helped-by: SZEDER Gábor <szeder.dev@gmail.com>
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-parallel-checkout.sh')
| -rw-r--r-- | t/lib-parallel-checkout.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-parallel-checkout.sh b/t/lib-parallel-checkout.sh index 21f5759732..83b279a846 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 "child_start\[..*\] git checkout--worker" "$trace_file" | wc -l)" && test $workers -eq $expected_workers && rm "$trace_file" } 8>&2 2>&4 |