perf test: Use "dummy" events in the PERF_RECORD_ test
authorArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 7 Jan 2016 16:17:00 +0000 (13:17 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 7 Jan 2016 16:17:00 +0000 (13:17 -0300)
As we're test just the !PERF_RECORD_SAMPLE records.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-qp8radcz3il4q9wbnseh337d@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/tests/perf-record.c

index 9d5f0b57c4c14ea9759f90462bb31aaf83a4ab75..8dc0baba87988fe8a786498b5cfa62bb64fcbc07 100644 (file)
@@ -45,7 +45,7 @@ int test__PERF_RECORD(int subtest __maybe_unused)
        };
        cpu_set_t cpu_mask;
        size_t cpu_mask_size = sizeof(cpu_mask);
-       struct perf_evlist *evlist = perf_evlist__new_default();
+       struct perf_evlist *evlist = perf_evlist__new_dummy();
        struct perf_evsel *evsel;
        struct perf_sample sample;
        const char *cmd = "sleep";
@@ -61,6 +61,9 @@ int test__PERF_RECORD(int subtest __maybe_unused)
        int total_events = 0, nr_events[PERF_RECORD_MAX] = { 0, };
        char sbuf[STRERR_BUFSIZE];
 
+       if (evlist == NULL) /* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */
+               evlist = perf_evlist__new_default();
+
        if (evlist == NULL || argv == NULL) {
                pr_debug("Not enough memory to create evlist\n");
                goto out;