Received-SPF: pass (google.com: domain of linux-kernel+bounces-77551-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <ZdepeMsjagbf1ufD@x1>
In-Reply-To: <ZdepeMsjagbf1ufD@x1>
From: Ian Rogers <irogers@google.com>
Date: Thu, 22 Feb 2024 16:02:07 -0800
Message-ID: <CAP-5=fVkA0-JMn-Xu-typJYFod-+LfyAwdUKCKEDQdQu4V_NNw@mail.gmail.com>
Subject: Re: [PATCH 1/1] perf test: Use TEST_FAIL in the TEST_ASSERT macros
 instead of -1
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>, Adrian Hunter <adrian.hunter@intel.com>, 
	Jiri Olsa <jolsa@kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	linux-perf-users@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, Feb 22, 2024 at 12:07=E2=80=AFPM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> Just to make things clearer, return TEST_FAIL (-1) instead of an open
> coded -1.
>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Ian Rogers <irogers@google.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Reviewed-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> ---
>  tools/perf/tests/tests.h | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
> index dad3d7414142d1be..3aa7701ee0e939f7 100644
> --- a/tools/perf/tests/tests.h
> +++ b/tools/perf/tests/tests.h
> @@ -4,11 +4,17 @@
>
>  #include <stdbool.h>
>
> +enum {
> +       TEST_OK   =3D  0,
> +       TEST_FAIL =3D -1,
> +       TEST_SKIP =3D -2,
> +};
> +
>  #define TEST_ASSERT_VAL(text, cond)                                     =
\
>  do {                                                                    =
\
>         if (!(cond)) {                                                   =
\
>                 pr_debug("FAILED %s:%d %s\n", __FILE__, __LINE__, text); =
\
> -               return -1;                                               =
\
> +               return TEST_FAIL;                                        =
\
>         }                                                                =
\
>  } while (0)
>
> @@ -17,16 +23,10 @@ do {                                                 =
                        \
>         if (val !=3D expected) {                                         =
  \
>                 pr_debug("FAILED %s:%d %s (%d !=3D %d)\n",               =
  \
>                          __FILE__, __LINE__, text, val, expected);       =
\
> -               return -1;                                               =
\
> +               return TEST_FAIL;                                        =
        \
>         }                                                                =
\
>  } while (0)
>
> -enum {
> -       TEST_OK   =3D  0,
> -       TEST_FAIL =3D -1,
> -       TEST_SKIP =3D -2,
> -};
> -
>  struct test_suite;
>
>  typedef int (*test_fnptr)(struct test_suite *, int);
> --
> 2.43.0
>