From f4d3e72ce614d61803fa612b15290ea85f960781 Mon Sep 17 00:00:00 2001 From: ngie Date: Thu, 9 Feb 2017 22:57:56 +0000 Subject: [PATCH] MFC r296586: r296586 (by bdrewery): Fix and connect setjmp test. git-svn-id: svn://svn.freebsd.org/base/stable/10@313489 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c | 2 +- contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c | 2 +- etc/mtree/BSD.tests.dist | 2 ++ lib/libc/tests/Makefile | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c b/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c index 4d2a93bab..34fd5cca9 100644 --- a/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c +++ b/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c @@ -87,7 +87,7 @@ __RCSID("$NetBSD: t_setjmp.c,v 1.1 2010/12/27 19:35:31 pgoyette Exp $"); static int expectsignal; static void -aborthandler(int signo) +aborthandler(int signo __unused) { ATF_REQUIRE_MSG(expectsignal, "kill(SIGABRT) succeeded"); atf_tc_pass(); diff --git a/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c b/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c index 4437c9272..201447074 100644 --- a/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c +++ b/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c @@ -91,7 +91,7 @@ static pthread_t myself = NULL; static int expectsignal; static void -aborthandler(int signo) +aborthandler(int signo __unused) { ATF_REQUIRE(myself == pthread_self()); ATF_REQUIRE_MSG(expectsignal, "kill(SIGABRT) succeeded"); diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 8e0beeb04..01b53620a 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -285,6 +285,8 @@ .. ssp .. + setjmp + .. stdio .. stdlib diff --git a/lib/libc/tests/Makefile b/lib/libc/tests/Makefile index 677f6979f..3a7adc4d2 100644 --- a/lib/libc/tests/Makefile +++ b/lib/libc/tests/Makefile @@ -15,6 +15,7 @@ TESTS_SUBDIRS+= nss TESTS_SUBDIRS+= regex TESTS_SUBDIRS+= resolv TESTS_SUBDIRS+= rpc +TESTS_SUBDIRS+= setjmp TESTS_SUBDIRS+= stdio TESTS_SUBDIRS+= stdlib TESTS_SUBDIRS+= string -- 2.42.0