2 files changed, 70 insertions, 0 deletions

diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile
index 29cf895006d1..6f57b8014a1e 100644
--- a/lib/libc/tests/stdlib/Makefile
+++ b/lib/libc/tests/stdlib/Makefile
@@ -75,6 +75,7 @@ LDFLAGS.$t+=	-L${LIBNETBSD_OBJDIR}
 LIBADD.${t}+=	netbsd util
 .endfor
 
+LIBADD.libc_exit_test+=		pthread
 LIBADD.strtod_test+=		m
 
 SUBDIR+=	dynthr_mod
diff --git a/lib/libc/tests/stdlib/libc_exit_test.c b/lib/libc/tests/stdlib/libc_exit_test.c
index c47d03d1d598..12965261bdb3 100644
--- a/lib/libc/tests/stdlib/libc_exit_test.c
+++ b/lib/libc/tests/stdlib/libc_exit_test.c
@@ -6,6 +6,7 @@
 
 #include <sys/wait.h>
 
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -78,8 +79,76 @@ ATF_TC_BODY(quick_exit, tc)
 	ATF_CHECK_STREQ("hello, abc", buf);
 }
 
+static void
+myatexit1(void)
+{
+	exit(12);
+}
+
+ATF_TC_WITHOUT_HEAD(recursive_exit1);
+ATF_TC_BODY(recursive_exit1, tc)
+{
+	pid_t pid;
+	int wstatus;
+
+	pid = fork();
+	if (pid == 0) {
+		atexit(myatexit1);
+		exit(1);
+	}
+	ATF_REQUIRE_MSG(pid > 0,
+	    "expect fork() to succeed");
+	ATF_CHECK_EQ_MSG(pid, waitpid(pid, &wstatus, 0),
+	    "expect to collect child process");
+	ATF_CHECK(WIFEXITED(wstatus));
+	ATF_CHECK_EQ(WEXITSTATUS(wstatus), 12);
+}
+
+static pthread_barrier_t barrier;
+
+static void
+myatexit2(void)
+{
+	pthread_barrier_wait(&barrier);
+	exit(12);
+}
+
+static void *
+mythreadexit(void *arg)
+{
+	pthread_barrier_wait(&barrier);
+	exit(15);
+}
+
+ATF_TC_WITHOUT_HEAD(recursive_exit2);
+ATF_TC_BODY(recursive_exit2, tc)
+{
+	pid_t pid;
+	int wstatus;
+
+	pid = fork();
+	if (pid == 0) {
+		pthread_t thr;
+
+		atexit(myatexit2);
+
+		pthread_barrier_init(&barrier, NULL, 2);
+		pthread_create(&thr, NULL, mythreadexit, NULL);
+
+		exit(1);
+	}
+	ATF_REQUIRE_MSG(pid > 0,
+	    "expect fork() to succeed");
+	ATF_CHECK_EQ_MSG(pid, waitpid(pid, &wstatus, 0),
+	    "expect to collect child process");
+	ATF_CHECK(WIFEXITED(wstatus));
+	ATF_CHECK_EQ(WEXITSTATUS(wstatus), 12);
+}
+
 ATF_TP_ADD_TCS(tp)
 {
 	ATF_TP_ADD_TC(tp, quick_exit);
+	ATF_TP_ADD_TC(tp, recursive_exit1);
+	ATF_TP_ADD_TC(tp, recursive_exit2);
 	return (atf_no_error());
 }