[PATCH] test: wrap 'wc -l' results in arithmetic evaluation to strip whitespace

Jani Nikula jani at nikula.org
Wed Jan 18 10:00:25 PST 2017


On Thu, 05 Jan 2017, Tomi Ollila <tomi.ollila at iki.fi> wrote:
> Some new unwrapped 'wc -l's have been added since Jani's 60e79e3a9f1c8

LGTM

> ---
>
> test/T070-insert.sh        | 2 +-
>  test/T580-thread-search.sh | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/test/T070-insert.sh b/test/T070-insert.sh
> index 57472b913964..7fb3b87e4584 100755
> --- a/test/T070-insert.sh
> +++ b/test/T070-insert.sh
> @@ -60,7 +60,7 @@ test_expect_equal_json "$output" "$expected"
>  
>  test_begin_subtest "Insert duplicate message"
>  notmuch insert +duptag -unread < "$gen_msg_filename"
> -output=$(notmuch search --output=files "subject:insert-subject" | wc -l)
> +output=$((`notmuch search --output=files "subject:insert-subject" | wc -l`))
>  test_expect_equal "$output" 2
>  
>  test_begin_subtest "Duplicate message does not change tags"
> diff --git a/test/T580-thread-search.sh b/test/T580-thread-search.sh
> index 6f7106db475a..512559a3aff9 100755
> --- a/test/T580-thread-search.sh
> +++ b/test/T580-thread-search.sh
> @@ -15,7 +15,7 @@ count=0
>  success=0
>  for id in $(notmuch search --output=messages '*'); do
>      count=$((count +1))
> -    matches=$(notmuch search --output=threads "$id" | wc -l)
> +    matches=$((`notmuch search --output=threads "$id" | wc -l`))
>      if [ "$matches" = 1 ]; then
>  	success=$((success + 1))
>      fi
> -- 
> 2.8.2
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch


More information about the notmuch mailing list