Received-SPF: pass (google.com: domain of linux-kernel+bounces-28323-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240112120737.1995575-1-james.clark@arm.com>
In-Reply-To: <20240112120737.1995575-1-james.clark@arm.com>
From: Namhyung Kim <namhyung@kernel.org>
Date: Tue, 16 Jan 2024 13:54:55 -0800
Message-ID: <CAM9d7ciUkjeU1+vzb7ydKCcU=Pybu-qVWFG2Tr+QUPDjJbGNVw@mail.gmail.com>
Subject: Re: [PATCH] perf test: Fixed masked error condition in perf data
 convert test
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>, 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
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, Jan 12, 2024 at 4:07=E2=80=AFAM James Clark <james.clark@arm.com> w=
rote:
>
> The test does set -e, so any errors go straight to the exit handler,
> where it returns err=3D0 (success). Fix it by leaving err=3D1 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 'p=
erf data convert --to-json'")
> Signed-off-by: James Clark <james.clark@arm.com>

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks,
Namhyung


> ---
>  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/to=
ols/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=3D0
> +err=3D1
>
>  shelldir=3D$(dirname "$0")
>  # shellcheck source=3Dlib/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=3D1
>                 exit
>         fi
>  }
> @@ -49,7 +48,6 @@ validate_json_format()
>                         echo "The file contains valid JSON format [SUCCES=
S]"
>                 else
>                         echo "The file does not contain valid JSON format=
 [FAILED]"
> -                       err=3D1
>                         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=3D0 here.
> +err=3D0
> +exit
> --
> 2.34.1
>