]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
perf tests record: Fail the test if the 'errs' counter is not zero
authorArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 28 Sep 2022 15:55:43 +0000 (12:55 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 29 Sep 2022 12:53:15 +0000 (09:53 -0300)
We were just checking for the 'err' variable, when we should really see
if there was some of the many checked errors that don't stop the test
right away.

Detected with clang 15.0.0:

  44    75.23 fedora:37       : FAIL clang version 15.0.0 (Fedora 15.0.0-2.fc37)

    tests/perf-record.c:68:16: error: variable 'errs' set but not used [-Werror,-Wunused-but-set-variable]
            int err = -1, errs = 0, i, wakeups = 0;
                          ^
    1 error generated.

The patch introducing this 'perf test' entry had that check:

  +       return (err < 0 || errs > 0) ? -1 : 0;

But at some point we lost that:

  -   return (err < 0 || errs > 0) ? -1 : 0;
  +   if (err == -EACCES)
  +               return TEST_SKIP;
  +   if (err < 0)
  +               return TEST_FAIL;
  +   return TEST_OK

Put it back.

Fixes: 2cf88f4614c996e5 ("perf test: Use skip in PERF_RECORD_*")
Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/YzR0n5QhsH9VyYB0@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/tests/perf-record.c

index 6a001fcfed68e5172e9fcc817e3064fd761102b7..4952abe716f318b0789567348c8257373a2d4a4c 100644 (file)
@@ -332,7 +332,7 @@ out_delete_evlist:
 out:
        if (err == -EACCES)
                return TEST_SKIP;
-       if (err < 0)
+       if (err < 0 || errs != 0)
                return TEST_FAIL;
        return TEST_OK;
 }