From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: Re: [PATCH] test: optionally print subtest number
In-Reply-To: <1323806207-31888-1-git-send-email-david@tethera.net>
References: <1323806207-31888-1-git-send-email-david@tethera.net>
User-Agent: Notmuch/0.10.2+96~g74e5ae5 (http://notmuchmail.org) Emacs/23.3.1
	(x86_64-pc-linux-gnu)
Date: Wed, 14 Dec 2011 00:15:43 +0400
Message-ID: <87ty54ut1s.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: David Bremner <bremner@debian.org>
Precedence: list

On Tue, 13 Dec 2011 15:56:47 -0400, David Bremner <david@tethera.net> wrote:
> From: David Bremner <bremner@debian.org>
> 
> The idea is that $test_count could be used in tests to label
> intermediate files. The output enabled by this patch (and --debug)
> helps figure out which OUTPUT.nn file belongs to which test in case
> several subtests write to OUTPUT.$test_count
> ---
> 
> Is there something that depends on the test format? I find it pretty
> handy to have the subtest numbers, but I don't want to break some
> other tools. I followed the existing style of conditionally defining
> functions, but maybe someone with more bash-fu can improve that.
> 

Looks good to me.  Except for tabs taking too much space.  Perhaps the
following would be better?

	printf "%-4s" "[$(($test_count - 1))]"

Regards,
  Dmitry

>  test/test-lib.sh |   12 ++++++++++++
>  1 files changed, 12 insertions(+), 0 deletions(-)
> 
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index 6be93fe..aaaaf5c 100644
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -116,6 +116,16 @@ do
>  	esac
>  done
>  
> +if test -n "$debug"; then
> +    print_subtest () {
> +	printf "\t[%d]\t" $(($test_count - 1))
> +    }
> +else
> +    print_subtest () {
> +	true
> +    }
> +fi
> +
>  if test -n "$color"; then
>  	say_color () {
>  		(
> @@ -132,6 +142,7 @@ if test -n "$color"; then
>  		printf " "
>                  printf "$@"
>  		tput sgr0
> +		print_subtest
>  		)
>  	}
>  else
> @@ -140,6 +151,7 @@ else
>  		shift
>  		printf " "
>                  printf "$@"
> +		print_subtest
>  	}
>  fi
>  
> -- 
> 1.7.5.4
> 
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch