Sat Jan 11 19:13:41 2014 UTC ()
Make the output of the test case better suited for debugging (output full
backtrace before failing any unclear asserts)


(martin)
diff -r1.10 -r1.11 src/tests/lib/libexecinfo/t_backtrace.c
cvs diff -r1.10 -r1.11 src/tests/lib/libexecinfo/t_backtrace.c (expand / switch to unified diff)

--- src/tests/lib/libexecinfo/t_backtrace.c 2013/08/16 11:57:15 1.10
+++ src/tests/lib/libexecinfo/t_backtrace.c 2014/01/11 19:13:41 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: t_backtrace.c,v 1.10 2013/08/16 11:57:15 martin Exp $ */ 1/* $NetBSD: t_backtrace.c,v 1.11 2014/01/11 19:13:41 martin Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2012 The NetBSD Foundation, Inc. 4 * Copyright (c) 2012 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Christos Zoulas. 8 * by Christos Zoulas.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -19,31 +19,32 @@ @@ -19,31 +19,32 @@
19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31#include <sys/cdefs.h> 31#include <sys/cdefs.h>
32__RCSID("$NetBSD: t_backtrace.c,v 1.10 2013/08/16 11:57:15 martin Exp $"); 32__RCSID("$NetBSD: t_backtrace.c,v 1.11 2014/01/11 19:13:41 martin Exp $");
33 33
34#include <atf-c.h> 34#include <atf-c.h>
35#include <atf-c/config.h> 35#include <atf-c/config.h>
36#include <string.h> 36#include <string.h>
 37#include <stdio.h>
37#include <stdlib.h> 38#include <stdlib.h>
38#include <execinfo.h> 39#include <execinfo.h>
39#include <unistd.h> 40#include <unistd.h>
40 41
41#ifndef __arraycount 42#ifndef __arraycount
42#define __arraycount(a) (sizeof(a) / sizeof(a[0])) 43#define __arraycount(a) (sizeof(a) / sizeof(a[0]))
43#endif 44#endif
44 45
45void myfunc3(size_t ncalls); 46void myfunc3(size_t ncalls);
46void myfunc2(size_t ncalls); 47void myfunc2(size_t ncalls);
47void myfunc1(size_t origcalls, volatile size_t ncalls); 48void myfunc1(size_t origcalls, volatile size_t ncalls);
48void myfunc(size_t ncalls); 49void myfunc(size_t ncalls);
49 50
@@ -59,32 +60,39 @@ myfunc3(size_t ncalls) @@ -59,32 +60,39 @@ myfunc3(size_t ncalls)
59 size_t j, nptrs, min_frames, max_frames; 60 size_t j, nptrs, min_frames, max_frames;
60 void *buffer[ncalls + 10]; 61 void *buffer[ncalls + 10];
61 char **strings; 62 char **strings;
62 __CTASSERT(__arraycount(top) == __arraycount(optional_frame)); 63 __CTASSERT(__arraycount(top) == __arraycount(optional_frame));
63 64
64 min_frames = 0; 65 min_frames = 0;
65 max_frames = 0; 66 max_frames = 0;
66 for (j = 0; j < __arraycount(optional_frame); ++j) { 67 for (j = 0; j < __arraycount(optional_frame); ++j) {
67 if (!optional_frame[j]) 68 if (!optional_frame[j])
68 ++min_frames; 69 ++min_frames;
69 ++max_frames; 70 ++max_frames;
70 } 71 }
71 nptrs = backtrace(buffer, __arraycount(buffer)); 72 nptrs = backtrace(buffer, __arraycount(buffer));
72 ATF_REQUIRE(nptrs >= ncalls + 2 + min_frames); 
73 ATF_REQUIRE(nptrs <= ncalls + 2 + max_frames); 
74 
75 strings = backtrace_symbols_fmt(buffer, nptrs, "%n"); 73 strings = backtrace_symbols_fmt(buffer, nptrs, "%n");
76 74
77 ATF_CHECK(strings != NULL); 75 ATF_CHECK(strings != NULL);
 76
 77 printf("got nptrs=%zu ncalls=%zu (min_frames: %zu, max_frames: %zu)\n",
 78 nptrs, ncalls, min_frames, max_frames);
 79 printf("backtrace is:\n");
 80 for (j = 0; j < nptrs; j++) {
 81 printf("#%zu: %s\n", j, strings[j]);
 82 }
 83
 84 ATF_REQUIRE(nptrs >= ncalls + 2 + min_frames);
 85 ATF_REQUIRE(nptrs <= ncalls + 2 + max_frames);
78 ATF_CHECK_STREQ(strings[0], "myfunc3"); 86 ATF_CHECK_STREQ(strings[0], "myfunc3");
79 ATF_CHECK_STREQ(strings[1], "myfunc2"); 87 ATF_CHECK_STREQ(strings[1], "myfunc2");
80 88
81 for (j = 2; j < ncalls + 2; j++) 89 for (j = 2; j < ncalls + 2; j++)
82 ATF_CHECK_STREQ(strings[j], "myfunc1"); 90 ATF_CHECK_STREQ(strings[j], "myfunc1");
83 91
84 for (size_t i = 0; j < nptrs; i++, j++) { 92 for (size_t i = 0; j < nptrs; i++, j++) {
85 if (optional_frame[i] && strcmp(strings[j], top[i])) { 93 if (optional_frame[i] && strcmp(strings[j], top[i])) {
86 --i; 94 --i;
87 continue; 95 continue;
88 } 96 }
89 ATF_CHECK_STREQ(strings[j], top[i]); 97 ATF_CHECK_STREQ(strings[j], top[i]);
90 } 98 }