Re: [PATCH 16/16] test-lib-functions: remove last two parameter count assertions
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 12, 2021, 19:40 UTC
- Message-ID
- <xmqq5z0rcmvz.fsf@gitster.g>
- In-Reply-To
- <patch-16.16-b4a018a63f3-20210412T110456Z-avarab@gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> Remove a couple of parameter count assertions where we'll now silently > do the wrong thing if given too many parameters, unlike the "$@" cases > in the preceding commit where "test" etc. handle the check for usi.
What's "usi" (not a "cow", I presume)?
If test_line_count is given 2 or 4 parameters, we'd call BUG---does that "silently do the wrong thing"? Why?
Show 42 quoted lines
> In the case of "test_file_size", the "test-tool" we're invoking is
> happy to accept N parameters (it'll print out all N sizes). Let's just
> use "$@" in that case anyway, there's only a few callers, and
> eventually those should probably be moved to use the test-tool
> directly.
>
> That only leaves test_line_count, I suppose I could leave that one
> alone, but since it's the only common function left that does this
> assertion let's remove it for the brevity of the -x output and
> consistency with other functions.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> t/test-lib-functions.sh | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
> index 2cf72b56851..32d6b98b972 100644
> --- a/t/test-lib-functions.sh
> +++ b/t/test-lib-functions.sh
> @@ -822,10 +822,7 @@ test_path_is_missing () {
> # output through when the number of lines is wrong.
>
> test_line_count () {
> - if test $# != 3
> - then
> - BUG "not 3 parameters to test_line_count"
> - elif ! test $(wc -l <"$3") "$1" "$2"
> + if ! test $(wc -l <"$3") "$1" "$2"
> then
> echo "test_line_count: line count for $3 !$1 $2"
> cat "$3"
> @@ -834,8 +831,7 @@ test_line_count () {
> }
>
> test_file_size () {
> - test "$#" -ne 1 && BUG "1 param"
> - test-tool path-utils file-size "$1"
> + test-tool path-utils file-size "$@"
> }
>
> # Returns success if a comma separated string of keywords ($1) contains a