diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-09-08 22:53:06 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-09-09 11:39:02 -0300 |
| commit | 32c7f7383a096a4fc878fdda686c7725945e8a8f (patch) | |
| tree | f41ec7b4377764e130dbfcaaf5b177687b622617 | |
| parent | d5cb2aef4fda355fbafe8db4f425b73ea94d2019 (diff) | |
| download | linux-stable-32c7f7383a096a4fc878fdda686c7725945e8a8f.tar.gz linux-stable-32c7f7383a096a4fc878fdda686c7725945e8a8f.tar.bz2 linux-stable-32c7f7383a096a4fc878fdda686c7725945e8a8f.zip | |
perf test: Remove die() calls
Just use pr_err() + return -1 and let the other tests run as well and
then the perf's main() exit doing whatever it needs.
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-n5ahw26e94klmde9cz6rxsdf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/builtin-test.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c index cf33e5081c36..6ae102eba5fa 100644 --- a/tools/perf/builtin-test.c +++ b/tools/perf/builtin-test.c @@ -1023,14 +1023,16 @@ static int __test__rdpmc(void) fd = sys_perf_event_open(&attr, 0, -1, -1, 0); if (fd < 0) { - die("Error: sys_perf_event_open() syscall returned " - "with %d (%s)\n", fd, strerror(errno)); + pr_debug("Error: sys_perf_event_open() syscall returned " + "with %d (%s)\n", fd, strerror(errno)); + return -1; } addr = mmap(NULL, page_size, PROT_READ, MAP_SHARED, fd, 0); if (addr == (void *)(-1)) { - die("Error: mmap() syscall returned " - "with (%s)\n", strerror(errno)); + pr_debug("Error: mmap() syscall returned with (%s)\n", + strerror(errno)); + goto out_close; } for (n = 0; n < 6; n++) { @@ -1051,9 +1053,9 @@ static int __test__rdpmc(void) } munmap(addr, page_size); - close(fd); - pr_debug(" "); +out_close: + close(fd); if (!delta_sum) return -1; |