]> git.baikalelectronics.ru Git - kernel.git/commitdiff
perf tests: Stop Convert perf time to TSC test opening events twice
authorAdrian Hunter <adrian.hunter@intel.com>
Wed, 13 Jul 2022 12:34:58 +0000 (15:34 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Sun, 17 Jul 2022 13:56:58 +0000 (10:56 -0300)
Do not call evlist__open() twice.

Fixes: 5bb017d4b97a0f13 ("perf test: Fix error message for test case 71 on s390, where it is not supported")
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Link: https://lore.kernel.org/r/20220713123459.24145-2-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/tests/perf-time-to-tsc.c

index 4ad0dfbc8b21fda12f5c6468b8fdd1095efa73f3..8d6d60173693cd2633c3ccc46e8bce870a3a5b44 100644 (file)
@@ -123,11 +123,14 @@ static int test__perf_time_to_tsc(struct test_suite *test __maybe_unused, int su
                evsel->core.attr.enable_on_exec = 0;
        }
 
-       if (evlist__open(evlist) == -ENOENT) {
-               err = TEST_SKIP;
+       ret = evlist__open(evlist);
+       if (ret < 0) {
+               if (ret == -ENOENT)
+                       err = TEST_SKIP;
+               else
+                       pr_debug("evlist__open() failed\n");
                goto out_err;
        }
-       CHECK__(evlist__open(evlist));
 
        CHECK__(evlist__mmap(evlist, UINT_MAX));