perf test: Remove die() calls
Commit-ID: 32c7f7383a096a4fc878fdda686c7725945e8a8f Gitweb: http://git.kernel.org/tip/32c7f7383a096a4fc878fdda686c7725945e8a8f Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 8 Sep 2012 22:53:06 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Sun, 9 Sep 2012 11:39:02 -0300
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 <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-test.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
tools/perf/builtin-test.c +8 -6
@@ -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 ;