From dd4c0b5a6c01a6473e45c8b2d67700dda9d4ae0b Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Tue, 29 Oct 2019 18:24:36 +0000 Subject: [PATCH] libexecinfo test: Don't strip installed test It turns out that a test of backtrace symbol resolution and formatting requires symbols. Another option mightt be building with -rdynamic instead, but this works for now. Re-enabled skipped CI test, as it should now pass. PR: 241562 Submitted by: lwhsu Reported by: lwhsu X-MFC-With: r354126, r354135, r354144 --- contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c | 3 --- lib/libexecinfo/tests/Makefile | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c b/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c index f1bf33856a62..cc97cbb2ec45 100644 --- a/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c +++ b/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c @@ -151,9 +151,6 @@ ATF_TC_HEAD(backtrace_fmt_basic, tc) ATF_TC_BODY(backtrace_fmt_basic, tc) { - if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) - atf_tc_skip("https://bugs.freebsd.org/241562"); - myfunc(12); if (prevent_inline) diff --git a/lib/libexecinfo/tests/Makefile b/lib/libexecinfo/tests/Makefile index 3f06abb2409b..da34964c5005 100644 --- a/lib/libexecinfo/tests/Makefile +++ b/lib/libexecinfo/tests/Makefile @@ -6,6 +6,12 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libexecinfo .include +# Perhaps not surprisingly, the backtrace symbol test needs symbols. Leave +# them in: +STRIP= +# It could probably be made to work without symbols by checking pointer values +# instead, but part of the tested functionality is the symbol resolution logic, +# so that doesn't seem useful. NETBSD_ATF_TESTS_C+= backtrace_test LIBADD.backtrace_test+= execinfo