svn commit: r313489 - in stable/10: contrib/netbsd-tests/lib/libc/setjmp etc/mtree lib/libc/tests

[Ngie Cooper]

Author: ngie
Date: Thu Feb  9 22:57:56 2017
New Revision: 313489
URL: https://svnweb.freebsd.org/changeset/base/313489

Log:
  MFC r296586:
  r296586 (by bdrewery):
  
  Fix and connect setjmp test.

Modified:
  stable/10/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c
  stable/10/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/lib/libc/tests/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c	Thu Feb  9 22:49:48 2017	(r313488)
+++ stable/10/contrib/netbsd-tests/lib/libc/setjmp/t_setjmp.c	Thu Feb  9 22:57:56 2017	(r313489)
@@ -87,7 +87,7 @@ __RCSID("$NetBSD: t_setjmp.c,v 1.1 2010/
 static int expectsignal;
 
 static void
-aborthandler(int signo)
+aborthandler(int signo __unused)
 {
 	ATF_REQUIRE_MSG(expectsignal, "kill(SIGABRT) succeeded");
 	atf_tc_pass();

Modified: stable/10/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c	Thu Feb  9 22:49:48 2017	(r313488)
+++ stable/10/contrib/netbsd-tests/lib/libc/setjmp/t_threadjmp.c	Thu Feb  9 22:57:56 2017	(r313489)
@@ -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");

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Thu Feb  9 22:49:48 2017	(r313488)
+++ stable/10/etc/mtree/BSD.tests.dist	Thu Feb  9 22:57:56 2017	(r313489)
@@ -285,6 +285,8 @@
             ..
             ssp
             ..
+            setjmp
+            ..
             stdio
             ..
             stdlib

Modified: stable/10/lib/libc/tests/Makefile
==============================================================================
--- stable/10/lib/libc/tests/Makefile	Thu Feb  9 22:49:48 2017	(r313488)
+++ stable/10/lib/libc/tests/Makefile	Thu Feb  9 22:57:56 2017	(r313489)
@@ -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