From 43e9023f2d8b0286cfd438a6ff721775fb8ba2a0 Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Sun, 27 Oct 2019 05:32:08 +0000
Subject: [PATCH] libexecinfo: Integrate NetBSD test into FreeBSD

---
 etc/mtree/BSD.tests.dist       |  2 ++
 lib/libexecinfo/Makefile       |  8 ++++++--
 lib/libexecinfo/tests/Makefile | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 lib/libexecinfo/tests/Makefile

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 7383d50be466..0980847ceafd 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -384,6 +384,8 @@
         ..
         libdevdctl
         ..
+        libexecinfo
+        ..
         libkvm
         ..
         libmp
diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile
index fed41fa1d4a3..d130d5795918 100644
--- a/lib/libexecinfo/Makefile
+++ b/lib/libexecinfo/Makefile
@@ -1,12 +1,13 @@
 # $FreeBSD$
 
 PACKAGE=lib${LIB}
-LIBEXECINFO=	${SRCTOP}/contrib/libexecinfo
+
+.include <src.opts.mk>
 
 LIB=		execinfo
 SHLIB_MAJOR=	1
 
-.PATH:		${LIBEXECINFO}
+.PATH:		${SRCTOP}/contrib/libexecinfo
 
 INCS=		execinfo.h
 SRCS=		backtrace.c symtab.c unwind.c
@@ -21,4 +22,7 @@ MLINKS+=	backtrace.3 backtrace_symbols_fmt.3
 MLINKS+=	backtrace.3 backtrace_symbols_fd.3
 MLINKS+=	backtrace.3 backtrace_symbols_fd_fmt.3
 
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
 .include <bsd.lib.mk>
diff --git a/lib/libexecinfo/tests/Makefile b/lib/libexecinfo/tests/Makefile
new file mode 100644
index 000000000000..3f06abb2409b
--- /dev/null
+++ b/lib/libexecinfo/tests/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PACKAGE=	tests
+
+TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libexecinfo
+
+.include <bsd.own.mk>
+
+NETBSD_ATF_TESTS_C+=	backtrace_test
+
+LIBADD.backtrace_test+=	execinfo
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>