Re: [PATCH v2 3/5] test/lib/perf_report: Use own flag to track initialisation

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 2167 bytes --]

On Mon, Oct 31, 2022 at 12:20:57PM +0100, Stefano Brivio wrote:
> Instead of just disabling performance reports if running in demo
> mode. This allows us to use table functions outside of performance
> reports.
> 
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  test/lib/perf_report | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/test/lib/perf_report b/test/lib/perf_report
> index ed71ef9..4ffb14b 100755
> --- a/test/lib/perf_report
> +++ b/test/lib/perf_report
> @@ -13,6 +13,7 @@
>  # Copyright (c) 2021 Red Hat GmbH
>  # Author: Stefano Brivio <sbrivio@redhat.com>
>  
> +PERF_INIT=0
>  PERF_LINK_COUNT=0
>  PERF_JS="${LOGDIR}/web/perf.js"
>  
> @@ -129,6 +130,7 @@ perf_init() {
>          mkdir -p "$(dirname "${PERF_JS}")"
>  	echo "${PERF_TEMPLATE_HTML}" > "${PERF_JS}"
>  	perf_report_sub commit "$(echo ${COMMIT} | sed "s/'/\\\'/g")"
> +	PERF_INIT=1
>  }
>  
>  # perf_fill_lines() - Fill multiple "LINE" directives in template, matching rows
> @@ -178,6 +180,7 @@ perf_fill_lines() {
>  
>  # perf_finish() - Add trailing backslashes and process ending templates
>  perf_finish() {
> +	PERF_INIT=0
>  	perf_fill_lines
>  	sed -i 's/^.*$/&\\/g' "${PERF_JS}"
>  	echo "${PERF_TEMPLATE_JS}" >> "${PERF_JS}"
> @@ -215,7 +218,7 @@ perf_report() {
>  
>  # perf_th() - Table header for a set of tests
>  perf_th() {
> -	[ ${DEMO} -eq 1 ] && return
> +	[ ${PERF_INIT} -eq 0 ] && return
>  
>  	shift
>  
> @@ -231,7 +234,7 @@ perf_th() {
>  
>  # perf_tr() - Main table row
>  perf_tr() {
> -	[ ${DEMO} -eq 1 ] && return
> +	[ ${PERF_INIT} -eq 0 ] && return
>  
>  	__line_no=0
>  	shift
> @@ -244,7 +247,7 @@ perf_tr() {
>  
>  # perf_td() - Single cell with test result
>  perf_td() {
> -	[ ${DEMO} -eq 1 ] && return
> +	[ ${PERF_INIT} -eq 0 ] && return
>  
>  	__rewind="${1}"
>  	shift

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]