Received-SPF: pass (google.com: domain of linux-kernel+bounces-28602-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 16 Jan 2024 23:37:34 -0800 (PST)
From: Ilkka Koskinen <ilkka@os.amperecomputing.com>
To: James Clark <james.clark@arm.com>
cc: linux-perf-users@vger.kernel.org, ilkka@os.amperecomputing.com, 
    Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, 
    Arnaldo Carvalho de Melo <acme@kernel.org>, 
    Namhyung Kim <namhyung@kernel.org>, Mark Rutland <mark.rutland@arm.com>, 
    Alexander Shishkin <alexander.shishkin@linux.intel.com>, 
    Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>, 
    Adrian Hunter <adrian.hunter@intel.com>, 
    Athira Rajeev <atrajeev@linux.vnet.ibm.com>, 
    Anup Sharma <anupnewsmail@gmail.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] perf test: Fixed masked error condition in perf data
 convert test
In-Reply-To: <20240112120737.1995575-1-james.clark@arm.com>
Message-ID: <726d2423-13a-010-e72e-8d3366f9c542@os.amperecomputing.com>
References: <20240112120737.1995575-1-james.clark@arm.com>
Content-Type: text/plain; format=flowed; charset=US-ASCII
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?f1/h5CzmmyfG9z6hZhJe+TVBD+U/xdb5TOMs79p5omFNT7omB+gQniGo4VOm?=
 =?us-ascii?Q?oXz7C9JdqMnw1/f4cZk04Q+JxE+HJJuJL9wmIxsWmdXeFY8z1WGHw+qF9yKQ?=
 =?us-ascii?Q?EpTCUJ3m4fzjfKL3q+DQwO8iFV+c949b/osiBS0bk9IiZQT32YW9RzFpYvsr?=
 =?us-ascii?Q?PwHWTqJ6O/p7pErW8Mvh3vZUZ9Yt+iG1ebJxwDDk70xgUD5OPiGT+WLeYt9B?=
 =?us-ascii?Q?0XTQaJ/AA1JPw722t3et3ETcOy3P9FrvBOhaZvqtn6gJ4wgUwNMyKm2IQ6f1?=
 =?us-ascii?Q?FvY8hIf9BNmIB81xa/19h+fxQzwEEvTjdFVyHqtubUyMkDsZFFsBKS1CkR/Y?=
 =?us-ascii?Q?5bPYr84vKpUzocQVRhTSnmlkUGDsLaKO/0ba7oHXWFb2naIXBqMdc/aCHXW/?=
 =?us-ascii?Q?7Kqr6rvl/sciBAZakERtU/AX2x+p94JGHl+lUK7BqpemKrkXP73EjI4nvxN9?=
 =?us-ascii?Q?BnslveSmeoyWosGfHc8Sgq0tQ9nCZXiCPunZRNRKD+f80YGrJ1YhOYMdJqBu?=
 =?us-ascii?Q?J0xJhC/fL4bO1fqlGB6zqGst6aKLBJqzgfyY/hOYqyfamix1qgOh8Vib330d?=
 =?us-ascii?Q?1loi1trC+qB2xPwKCM26Z3vbPanQ/9sZ4Iv7KuEGPppSPTyaWkejxDz8xy4f?=
 =?us-ascii?Q?yxS7fl9LwkMZpUlCFV1m7oaNHl3fYeb+AcXpywJ5HGJ8JefwEEqXV2PnvoWw?=
 =?us-ascii?Q?E7pgKilidORA4duKGWY8yE2bDVviryi7yG3lstBcbiY005+t0MvOjDu9BIYr?=
 =?us-ascii?Q?bJairBxJ3zo4v7dEexJ7PWDchaFViSRYzTdHYmwe/d7wqTgPSfzDRv4l5bzw?=
 =?us-ascii?Q?KHprWcgsiSzOMw1r60bZEPQn4v+3vCPfp7KdSgJZC2wHo7bljPIkHMQQIfTg?=
 =?us-ascii?Q?TvDE/bzl4yT6loWoigrVebtT8TzSFe2A/JZfYbZNCU8uYz9aLzpKUCH3x16K?=
 =?us-ascii?Q?gLL29uvOJyLtUwoxxnM3udffZEsJY+ncyOz0wNNOHtI1RA+SievzRVPU8fAv?=
 =?us-ascii?Q?v3rzrnATxilOhp5ryLG9pKmRhgNikll9zWEUb8JA9dngnoeOArsLacp3lKrQ?=
 =?us-ascii?Q?hjp1pgepdUJLzU4keRMOqHL+ARzoboMZq2P2Ar1RtN39jxc52VCyrqIIuHAr?=
 =?us-ascii?Q?qidlIWHcdAyy28QLN+cp8D03ddZRzy59lRkS4rnNjnTrL4Zuf6gP/OLPvaCH?=
 =?us-ascii?Q?JHNqGhXc4SPQ7/frhUbL1/RxGrPoj3KJ4eQ5pGWwPY1sMPLER/I5UxIqkzJT?=
 =?us-ascii?Q?3IIzzDQYdgLS+SnpDMoO+8AlcHyBcex8cZcXFJ1GsGJZAsgSqYISD0LLCDvV?=
 =?us-ascii?Q?ZexBa/Ffg8y00868XKhJfqvsYMbJ+CNw76WznhIR1grZnC+HGLuJjgrUEWOe?=
 =?us-ascii?Q?kUhH0myot+WU55dSEhzynLHZs4oeLc6d87xaWFckiU4YF3pjR7TkMsnTuEBY?=
 =?us-ascii?Q?3OIuaUt8/sPrDKMeBPdAAzgQDiridfZcG9wb73XFHNljzeYUwwCH/mKkUTz5?=
 =?us-ascii?Q?xEsmz6EkdFW4MsEbLL856Zk+l26SBQSin/M4P+7Son7BP5CBoCqE1hZBK8aL?=
 =?us-ascii?Q?/tgnKF/29pK7Ic28RiS7UwO8efV81UFFQbtxDuLjGdwrSAS31ka4e3GE2RhY?=
 =?us-ascii?Q?UvClBmgC8elu64zFXuzmsWM=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d90434de-c39d-4c70-e5f5-08dc172f2ef1
X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB8166.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2024 07:37:39.9600
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: efTHwvZ//eTv7NidAwvv73ceInnEVl87tztyIWOvI47MbD8GJ0tz9TfI8/550Zd7ZSigqjp7Z6smr3cWW85opC+fw8QYq7dBwOtRp+ZP5bMw8vVfoIiEWerGEgCKNPAb
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR01MB6333


On Fri, 12 Jan 2024, James Clark wrote:

> The test does set -e, so any errors go straight to the exit handler,
> where it returns err=0 (success). Fix it by leaving err=1 from the
> beginning and only set the success code if it ran all the way to the end
> without errors.
>
> Also remove the exit code argument from the last exit because it doesn't
> do anything, it's always replaced by err in the exit handler.
>
> Fixes: 68d124182610 ("perf test: Add test validating JSON generated by 'perf data convert --to-json'")
> Signed-off-by: James Clark <james.clark@arm.com>

Looks good to me.


Reviewed-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>

Cheers, Ilkka

> ---
> tools/perf/tests/shell/test_perf_data_converter_json.sh | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/tests/shell/test_perf_data_converter_json.sh b/tools/perf/tests/shell/test_perf_data_converter_json.sh
> index c4f1b59d116f..1781b7215c11 100755
> --- a/tools/perf/tests/shell/test_perf_data_converter_json.sh
> +++ b/tools/perf/tests/shell/test_perf_data_converter_json.sh
> @@ -4,7 +4,7 @@
>
> set -e
>
> -err=0
> +err=1
>
> shelldir=$(dirname "$0")
> # shellcheck source=lib/setup_python.sh
> @@ -36,7 +36,6 @@ test_json_converter_command()
> 		echo "Perf Data Converter Command to JSON [SUCCESS]"
> 	else
> 		echo "Perf Data Converter Command to JSON [FAILED]"
> -		err=1
> 		exit
> 	fi
> }
> @@ -49,7 +48,6 @@ validate_json_format()
> 			echo "The file contains valid JSON format [SUCCESS]"
> 		else
> 			echo "The file does not contain valid JSON format [FAILED]"
> -			err=1
> 			exit
> 		fi
> 	else
> @@ -62,4 +60,7 @@ validate_json_format()
> test_json_converter_command
> validate_json_format
>
> -exit ${err}
> +# Set -e is on, so it was only successful if it ran up to this point.
> +# Therefore only set err=0 here.
> +err=0
> +exit
> -- 
> 2.34.1
>
>