Re: misc/47827: [PATCH] improve portability of NetBSD libc testcases

To: misc-bug-people%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,netbsd-bugs%netbsd.org@localhost,yaneurabeya%gmail.com@localhost
Subject: Re: misc/47827: [PATCH] improve portability of NetBSD libc testcases
From: Garrett Cooper <yaneurabeya%gmail.com@localhost>
Date: Fri, 17 May 2013 17:05:03 +0000 (UTC)
The following reply was made to PR misc/47827; it has been noted by GNATS.

From: Garrett Cooper <yaneurabeya%gmail.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: misc/47827: [PATCH] improve portability of NetBSD libc testcases
Date: Fri, 17 May 2013 13:01:22 -0400

 --Apple-Mail=_0E583C49-25B9-45D5-B267-BB90A76B8167
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
        charset=us-ascii
 
        Here's the initial patch.
 Thanks!
 -Garrett
 
 
 --Apple-Mail=_0E583C49-25B9-45D5-B267-BB90A76B8167
 Content-Disposition: attachment;
        filename=netbsd-libc-test-portability-fixes.patch
 Content-Type: application/octet-stream;
        name="netbsd-libc-test-portability-fixes.patch"
 Content-Transfer-Encoding: 7bit
 
 Index: tests/lib/libc/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/Makefile.inc,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile.inc
 --- tests/lib/libc/Makefile.inc        3 Nov 2010 16:10:21 -0000       1.1
 +++ tests/lib/libc/Makefile.inc        17 May 2013 16:00:42 -0000
 @@ -1 +1,3 @@
 +CFLAGS+=      -I${.CURDIR:H:H}
 +
  .include "../Makefile.inc"
 Index: tests/lib/libc/c063/t_faccessat.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/c063/t_faccessat.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_faccessat.c
 --- tests/lib/libc/c063/t_faccessat.c  17 Mar 2013 04:46:06 -0000      1.2
 +++ tests/lib/libc/c063/t_faccessat.c  17 May 2013 16:00:42 -0000
 @@ -31,6 +31,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_faccessat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
  
 +#include <sys/param.h>
 +#include <sys/stat.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -39,7 +41,6 @@
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
 -#include <sys/param.h>
  
  #define DIR "dir"
  #define FILE "dir/faccessat"
 Index: tests/lib/libc/c063/t_fchmodat.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/c063/t_fchmodat.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_fchmodat.c
 --- tests/lib/libc/c063/t_fchmodat.c   17 Mar 2013 04:46:06 -0000      1.2
 +++ tests/lib/libc/c063/t_fchmodat.c   17 May 2013 16:00:42 -0000
 @@ -31,6 +31,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_fchmodat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
  
 +#include <sys/param.h>
 +#include <sys/stat.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -39,7 +41,6 @@
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
 -#include <sys/param.h>
  
  #define DIR "dir"
  #define FILE "dir/fchmodat"
 Index: tests/lib/libc/c063/t_fchownat.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/c063/t_fchownat.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_fchownat.c
 --- tests/lib/libc/c063/t_fchownat.c   17 Mar 2013 04:46:06 -0000      1.3
 +++ tests/lib/libc/c063/t_fchownat.c   17 May 2013 16:00:42 -0000
 @@ -31,6 +31,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_fchownat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $");
  
 +#include <sys/param.h>
 +#include <sys/stat.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -40,7 +42,6 @@
  #include <string.h>
  #include <unistd.h>
  #include <pwd.h>
 -#include <sys/param.h>
  
  #define DIR "dir"
  #define FILE "dir/fchownat"
 Index: tests/lib/libc/c063/t_fexecve.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/c063/t_fexecve.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_fexecve.c
 --- tests/lib/libc/c063/t_fexecve.c    17 Mar 2013 04:35:59 -0000      1.2
 +++ tests/lib/libc/c063/t_fexecve.c    17 May 2013 16:00:42 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_fexecve.c,v 1.2 2013/03/17 04:35:59 jmmv Exp $");
  
 +#include <sys/param.h>
  #include <sys/wait.h>
  
  #include <atf-c.h>
 @@ -43,7 +44,6 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
 -#include <sys/param.h>
  
  ATF_TC(fexecve);
  ATF_TC_HEAD(fexecve, tc)
 Index: tests/lib/libc/c063/t_fstatat.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/c063/t_fstatat.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_fstatat.c
 --- tests/lib/libc/c063/t_fstatat.c    17 Mar 2013 04:46:06 -0000      1.2
 +++ tests/lib/libc/c063/t_fstatat.c    17 May 2013 16:00:42 -0000
 @@ -31,6 +31,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_fstatat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
  
 +#include <sys/param.h>
 +#include <sys/stat.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -39,7 +41,6 @@
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
 -#include <sys/param.h>
  
  #define DIR "dir"
  #define FILE "dir/fstatat"
 Index: tests/lib/libc/c063/t_o_search.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/c063/t_o_search.c,v
 retrieving revision 1.4
 diff -u -r1.4 t_o_search.c
 --- tests/lib/libc/c063/t_o_search.c   17 Mar 2013 04:46:06 -0000      1.4
 +++ tests/lib/libc/c063/t_o_search.c   17 May 2013 16:00:42 -0000
 @@ -31,6 +31,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_o_search.c,v 1.4 2013/03/17 04:46:06 jmmv Exp $");
  
 +#include <sys/param.h>
 +#include <sys/stat.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -40,7 +42,6 @@
  #include <string.h>
  #include <unistd.h>
  #include <pwd.h>
 -#include <sys/param.h>
  
  /*
   * dholland 20130112: disable tests that require O_SEARCH semantics
 Index: tests/lib/libc/c063/t_openat.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/c063/t_openat.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_openat.c
 --- tests/lib/libc/c063/t_openat.c     17 Mar 2013 04:46:06 -0000      1.2
 +++ tests/lib/libc/c063/t_openat.c     17 May 2013 16:00:42 -0000
 @@ -31,6 +31,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_openat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
  
 +#include <sys/param.h>
 +#include <sys/stat.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -39,7 +41,6 @@
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
 -#include <sys/param.h>
  
  #define DIR "dir"
  #define FILE "dir/openat"
 Index: tests/lib/libc/c063/t_readlinkat.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/c063/t_readlinkat.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_readlinkat.c
 --- tests/lib/libc/c063/t_readlinkat.c 17 Mar 2013 04:46:06 -0000      1.3
 +++ tests/lib/libc/c063/t_readlinkat.c 17 May 2013 16:00:42 -0000
 @@ -31,6 +31,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_readlinkat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $");
  
 +#include <sys/param.h>
 +#include <sys/stat.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -39,7 +41,6 @@
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
 -#include <sys/param.h>
  
  #define DIR "dir"
  #define FILE "dir/readlinkat"
 Index: tests/lib/libc/c063/t_unlinkat.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/c063/t_unlinkat.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_unlinkat.c
 --- tests/lib/libc/c063/t_unlinkat.c   17 Mar 2013 04:46:06 -0000      1.2
 +++ tests/lib/libc/c063/t_unlinkat.c   17 May 2013 16:00:42 -0000
 @@ -31,6 +31,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_unlinkat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
  
 +#include <sys/param.h>
 +#include <sys/stat.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -39,7 +41,6 @@
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
 -#include <sys/param.h>
  
  #define DIR "dir"
  #define FILE "dir/unlinkat"
 Index: tests/lib/libc/c063/t_utimensat.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/c063/t_utimensat.c,v
 retrieving revision 1.5
 diff -u -r1.5 t_utimensat.c
 --- tests/lib/libc/c063/t_utimensat.c  17 Mar 2013 04:46:06 -0000      1.5
 +++ tests/lib/libc/c063/t_utimensat.c  17 May 2013 16:00:42 -0000
 @@ -31,6 +31,9 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_utimensat.c,v 1.5 2013/03/17 04:46:06 jmmv Exp $");
  
 +#include <sys/param.h>
 +#include <sys/stat.h>
 +#include <sys/time.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -39,8 +42,6 @@
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
 -#include <sys/param.h>
 -#include <sys/time.h>
  
  #define DIR "dir"
  #define FILE "dir/utimensat"
 Index: tests/lib/libc/gen/t_fmtcheck.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/gen/t_fmtcheck.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_fmtcheck.c
 --- tests/lib/libc/gen/t_fmtcheck.c    7 Jul 2011 09:49:59 -0000       1.2
 +++ tests/lib/libc/gen/t_fmtcheck.c    17 May 2013 16:00:42 -0000
 @@ -28,16 +28,17 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  
 -#include <atf-c.h>
 +#include <sys/param.h>
  
 +#include <err.h>
  #include <stdio.h>
  #include <stdlib.h>
  
 +#include <atf-c.h>
 +
  const char *fmtcheck(const char *f1, const char *f2)
                  __attribute__((__format_arg__(2)));
  
 -#include <err.h>
 -
  struct test_fmt {
        const char      *fmt1;
        const char      *fmt2;
 Index: tests/lib/libc/gen/t_glob.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/gen/t_glob.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_glob.c
 --- tests/lib/libc/gen/t_glob.c        2 Jan 2013 11:28:48 -0000       1.3
 +++ tests/lib/libc/gen/t_glob.c        17 May 2013 16:00:42 -0000
 @@ -34,8 +34,6 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_glob.c,v 1.3 2013/01/02 11:28:48 martin Exp $");
  
 -#include <atf-c.h>
 -
  #include <sys/param.h>
  #include <sys/stat.h>
  
 @@ -46,8 +44,9 @@
  #include <string.h>
  #include <errno.h>
  
 -#include "../../../h_macros.h"
 +#include "h_macros.h"
  
 +#include <atf-c.h>
  
  #ifdef DEBUG
  #define DPRINTF(a) printf a
 Index: tests/lib/libc/gen/t_humanize_number.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/gen/t_humanize_number.c,v
 retrieving revision 1.8
 diff -u -r1.8 t_humanize_number.c
 --- tests/lib/libc/gen/t_humanize_number.c     18 Mar 2012 07:14:08 -0000      
1.8
 +++ tests/lib/libc/gen/t_humanize_number.c     17 May 2013 16:00:42 -0000
 @@ -28,6 +28,7 @@
  
  #include <atf-c.h>
  
 +#include <sys/param.h>
  #include <err.h>
  #include <inttypes.h>
  #include <stdarg.h>
 Index: tests/lib/libc/gen/t_nice.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/gen/t_nice.c,v
 retrieving revision 1.8
 diff -u -r1.8 t_nice.c
 --- tests/lib/libc/gen/t_nice.c        18 Mar 2012 07:00:51 -0000      1.8
 +++ tests/lib/libc/gen/t_nice.c        17 May 2013 16:00:42 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_nice.c,v 1.8 2012/03/18 07:00:51 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <sys/resource.h>
  #include <sys/wait.h>
  
 Index: tests/lib/libc/gen/t_raise.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/gen/t_raise.c,v
 retrieving revision 1.5
 diff -u -r1.5 t_raise.c
 --- tests/lib/libc/gen/t_raise.c       10 May 2011 12:43:42 -0000      1.5
 +++ tests/lib/libc/gen/t_raise.c       17 May 2013 16:00:42 -0000
 @@ -31,13 +31,15 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_raise.c,v 1.5 2011/05/10 12:43:42 jruoho Exp $");
  
 -#include <atf-c.h>
 +#include <sys/param.h>
  
  #include <signal.h>
  #include <string.h>
  #include <time.h>
  #include <unistd.h>
  
 +#include <atf-c.h>
 +
  static bool   fail;
  static int    count;
  static void   handler_err(int);
 Index: tests/lib/libc/gen/t_siginfo.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/gen/t_siginfo.c,v
 retrieving revision 1.20
 diff -u -r1.20 t_siginfo.c
 --- tests/lib/libc/gen/t_siginfo.c     12 Apr 2013 17:30:50 -0000      1.20
 +++ tests/lib/libc/gen/t_siginfo.c     17 May 2013 16:00:42 -0000
 @@ -29,7 +29,7 @@
  #include <atf-c.h>
  #include <atf-c/config.h>
  
 -#include <sys/inttypes.h>
 +#include <sys/param.h>
  #include <sys/resource.h>
  #include <sys/sysctl.h>
  #include <sys/time.h>
 @@ -37,6 +37,7 @@
  #include <sys/wait.h>
  
  #include <assert.h>
 +#include <inttypes.h>
  #include <signal.h>
  #include <stdio.h>
  #include <stdlib.h>
 Index: tests/lib/libc/gen/t_sleep.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/gen/t_sleep.c,v
 retrieving revision 1.7
 diff -u -r1.7 t_sleep.c
 --- tests/lib/libc/gen/t_sleep.c       12 Apr 2013 17:13:55 -0000      1.7
 +++ tests/lib/libc/gen/t_sleep.c       17 May 2013 16:00:42 -0000
 @@ -26,8 +26,13 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  
 +#include <sys/cdefs.h>
 +#include <sys/event.h>
 +#include <sys/signal.h>
 +
  #include <atf-c.h>
  #include <errno.h>
 +#include <inttypes.h>
  #include <poll.h>
  #include <stdio.h>
  #include <stdlib.h>
 @@ -35,10 +40,6 @@
  #include <time.h>
  #include <unistd.h>
  
 -#include <sys/cdefs.h>
 -#include <sys/event.h>
 -#include <sys/signal.h>
 -
  #include "isqemu.h"
  
  #define BILLION               1000000000LL    /* nano-seconds per second */
 Index: tests/lib/libc/gen/t_time.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/gen/t_time.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_time.c
 --- tests/lib/libc/gen/t_time.c        11 Nov 2011 05:03:38 -0000      1.2
 +++ tests/lib/libc/gen/t_time.c        17 May 2013 16:00:42 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_time.c,v 1.2 2011/11/11 05:03:38 jruoho Exp $");
  
 +#include <sys/time.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <inttypes.h>
 Index: tests/lib/libc/gen/t_vis.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/gen/t_vis.c,v
 retrieving revision 1.6
 diff -u -r1.6 t_vis.c
 --- tests/lib/libc/gen/t_vis.c 13 Feb 2013 04:51:56 -0000      1.6
 +++ tests/lib/libc/gen/t_vis.c 17 May 2013 16:00:42 -0000
 @@ -28,6 +28,8 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  
 +#include <sys/param.h>
 +
  #include <atf-c.h>
  
  #include <string.h>
 Index: tests/lib/libc/inet/t_inet_network.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/inet/t_inet_network.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_inet_network.c
 --- tests/lib/libc/inet/t_inet_network.c       15 Jul 2011 11:27:23 -0000      
1.3
 +++ tests/lib/libc/inet/t_inet_network.c       17 May 2013 16:00:42 -0000
 @@ -34,6 +34,8 @@
   The NetBSD Foundation, inc. All rights reserved.");
  __RCSID("$NetBSD: t_inet_network.c,v 1.3 2011/07/15 11:27:23 jruoho Exp $");
  
 +#include <sys/param.h>
 +
  #include <arpa/inet.h>
  
  #include <atf-c.h>
 Index: tests/lib/libc/locale/t_wcstod.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/locale/t_wcstod.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_wcstod.c
 --- tests/lib/libc/locale/t_wcstod.c   1 Oct 2011 17:56:11 -0000       1.3
 +++ tests/lib/libc/locale/t_wcstod.c   17 May 2013 16:00:42 -0000
 @@ -60,6 +60,7 @@
  
  #include <errno.h>
  #include <math.h>
 +#include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include <wchar.h>
 Index: tests/lib/libc/net/t_getprotoent.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/net/t_getprotoent.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_getprotoent.c
 --- tests/lib/libc/net/t_getprotoent.c 4 Apr 2012 10:03:53 -0000       1.2
 +++ tests/lib/libc/net/t_getprotoent.c 17 May 2013 16:00:42 -0000
 @@ -31,6 +31,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_getprotoent.c,v 1.2 2012/04/04 10:03:53 joerg Exp $");
  
 +#include <sys/param.h>
 +
  #include <atf-c.h>
  #include <netdb.h>
  #include <limits.h>
 Index: tests/lib/libc/regex/debug.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/regex/debug.c,v
 retrieving revision 1.2
 diff -u -r1.2 debug.c
 --- tests/lib/libc/regex/debug.c       10 Oct 2011 04:32:41 -0000      1.2
 +++ tests/lib/libc/regex/debug.c       17 May 2013 16:00:42 -0000
 @@ -26,15 +26,15 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  
 +#include <sys/types.h>
  #include <ctype.h>
 +#include <inttypes.h>
  #include <limits.h>
  #include <regex.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  
 -#include <sys/types.h>
 -
  /* Don't sort these! */
  #include "utils.h"
  #include "regex2.h"
 Index: tests/lib/libc/setjmp/t_setjmp.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/setjmp/t_setjmp.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_setjmp.c
 --- tests/lib/libc/setjmp/t_setjmp.c   27 Dec 2010 19:35:31 -0000      1.1
 +++ tests/lib/libc/setjmp/t_setjmp.c   17 May 2013 16:00:42 -0000
 @@ -65,7 +65,7 @@
   The NetBSD Foundation, inc. All rights reserved.");
  __RCSID("$NetBSD: t_setjmp.c,v 1.1 2010/12/27 19:35:31 pgoyette Exp $");
  
 -#include <sys/types.h>
 +#include <sys/param.h>
  
  #include <errno.h>
  #include <setjmp.h>
 @@ -87,7 +87,7 @@
  static int expectsignal;
  
  static void
 -aborthandler(int signo)
 +aborthandler(int signo __unused)
  {
        ATF_REQUIRE_MSG(expectsignal, "kill(SIGABRT) succeeded");
        atf_tc_pass();
 Index: tests/lib/libc/setjmp/t_threadjmp.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/setjmp/t_threadjmp.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_threadjmp.c
 --- tests/lib/libc/setjmp/t_threadjmp.c        21 Apr 2011 18:58:20 -0000      
1.1
 +++ tests/lib/libc/setjmp/t_threadjmp.c        17 May 2013 16:00:42 -0000
 @@ -65,7 +65,7 @@
   The NetBSD Foundation, inc. All rights reserved.");
  __RCSID("$NetBSD: t_threadjmp.c,v 1.1 2011/04/21 18:58:20 martin Exp $");
  
 -#include <sys/types.h>
 +#include <sys/param.h>
  
  #include <errno.h>
  #include <setjmp.h>
 @@ -91,7 +91,7 @@
  static int expectsignal;
  
  static void
 -aborthandler(int signo)
 +aborthandler(int signo __unused)
  {
        ATF_REQUIRE(myself == pthread_self());
        ATF_REQUIRE_MSG(expectsignal, "kill(SIGABRT) succeeded");
 Index: tests/lib/libc/stdio/t_fopen.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/stdio/t_fopen.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_fopen.c
 --- tests/lib/libc/stdio/t_fopen.c     14 Sep 2011 14:34:37 -0000      1.3
 +++ tests/lib/libc/stdio/t_fopen.c     17 May 2013 16:00:42 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_fopen.c,v 1.3 2011/09/14 14:34:37 martin Exp $");
  
 +#include <sys/param.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 Index: tests/lib/libc/stdio/t_scanf.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/stdio/t_scanf.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_scanf.c
 --- tests/lib/libc/stdio/t_scanf.c     18 Mar 2012 07:00:51 -0000      1.3
 +++ tests/lib/libc/stdio/t_scanf.c     17 May 2013 16:00:42 -0000
 @@ -26,13 +26,14 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  
 +#include <sys/cdefs.h>
  #include <atf-c.h>
  #include <math.h>
  #include <stdio.h>
  #include <string.h>
  
  #define NUM     -0x1234
 -#define STRNUM  ___STRING(NUM)
 +#define STRNUM  __STRING(NUM)
  
  ATF_TC(sscanf_neghex);
  ATF_TC_HEAD(sscanf_neghex, tc)
 Index: tests/lib/libc/stdlib/t_abs.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/stdlib/t_abs.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_abs.c
 --- tests/lib/libc/stdlib/t_abs.c      29 Mar 2012 06:16:56 -0000      1.1
 +++ tests/lib/libc/stdlib/t_abs.c      17 May 2013 16:00:42 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_abs.c,v 1.1 2012/03/29 06:16:56 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <atf-c.h>
  #include <inttypes.h>
  #include <limits.h>
 Index: tests/lib/libc/stdlib/t_mi_vector_hash.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/stdlib/t_mi_vector_hash.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_mi_vector_hash.c
 --- tests/lib/libc/stdlib/t_mi_vector_hash.c   7 Jul 2011 11:12:18 -0000       
1.3
 +++ tests/lib/libc/stdlib/t_mi_vector_hash.c   17 May 2013 16:00:42 -0000
 @@ -34,6 +34,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_mi_vector_hash.c,v 1.3 2011/07/07 11:12:18 jruoho Exp $");
  
 +#include <sys/types.h>
  #include <atf-c.h>
  #include <stdlib.h>
  #include <string.h>
 Index: tests/lib/libc/stdlib/t_posix_memalign.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/stdlib/t_posix_memalign.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_posix_memalign.c
 --- tests/lib/libc/stdlib/t_posix_memalign.c   7 Jul 2011 11:12:18 -0000       
1.2
 +++ tests/lib/libc/stdlib/t_posix_memalign.c   17 May 2013 16:00:42 -0000
 @@ -34,6 +34,7 @@
   The NetBSD Foundation, inc. All rights reserved.");
  __RCSID("$NetBSD: t_posix_memalign.c,v 1.2 2011/07/07 11:12:18 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <atf-c.h>
  
  #include <errno.h>
 Index: tests/lib/libc/stdlib/t_random.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/stdlib/t_random.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_random.c
 --- tests/lib/libc/stdlib/t_random.c   29 Mar 2012 08:56:06 -0000      1.3
 +++ tests/lib/libc/stdlib/t_random.c   17 May 2013 16:00:42 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_random.c,v 1.3 2012/03/29 08:56:06 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <atf-c.h>
  #include <stdio.h>
  #include <stdlib.h>
 Index: tests/lib/libc/stdlib/t_strtod.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/stdlib/t_strtod.c,v
 retrieving revision 1.31
 diff -u -r1.31 t_strtod.c
 --- tests/lib/libc/stdlib/t_strtod.c   26 Sep 2012 07:24:38 -0000      1.31
 +++ tests/lib/libc/stdlib/t_strtod.c   17 May 2013 16:00:42 -0000
 @@ -34,6 +34,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_strtod.c,v 1.31 2012/09/26 07:24:38 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <errno.h>
  #include <math.h>
  #include <stdio.h>
 Index: tests/lib/libc/stdlib/t_strtol.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/stdlib/t_strtol.c,v
 retrieving revision 1.5
 diff -u -r1.5 t_strtol.c
 --- tests/lib/libc/stdlib/t_strtol.c   14 Jun 2011 02:45:58 -0000      1.5
 +++ tests/lib/libc/stdlib/t_strtol.c   17 May 2013 16:00:42 -0000
 @@ -32,6 +32,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_strtol.c,v 1.5 2011/06/14 02:45:58 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <atf-c.h>
  #include <errno.h>
  #include <stdlib.h>
 Index: tests/lib/libc/string/t_memcpy.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/string/t_memcpy.c,v
 retrieving revision 1.5
 diff -u -r1.5 t_memcpy.c
 --- tests/lib/libc/string/t_memcpy.c   17 Mar 2013 02:23:31 -0000      1.5
 +++ tests/lib/libc/string/t_memcpy.c   17 May 2013 16:00:42 -0000
 @@ -26,6 +26,7 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  
 +#include <sys/types.h>
  #include <atf-c.h>
  
  #include <stdio.h>
 Index: tests/lib/libc/string/t_strcat.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/string/t_strcat.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_strcat.c
 --- tests/lib/libc/string/t_strcat.c   14 Jul 2011 05:46:04 -0000      1.2
 +++ tests/lib/libc/string/t_strcat.c   17 May 2013 16:00:42 -0000
 @@ -5,6 +5,7 @@
   * Public domain.
   */
  
 +#include <sys/param.h>
  #include <atf-c.h>
  #include <string.h>
  #include <unistd.h>
 Index: tests/lib/libc/string/t_strcmp.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/string/t_strcmp.c,v
 retrieving revision 1.4
 diff -u -r1.4 t_strcmp.c
 --- tests/lib/libc/string/t_strcmp.c   25 Mar 2012 08:17:54 -0000      1.4
 +++ tests/lib/libc/string/t_strcmp.c   17 May 2013 16:00:42 -0000
 @@ -5,6 +5,7 @@
   * Public domain.
   */
  
 +#include <sys/param.h>
  #include <atf-c.h>
  #include <string.h>
  #include <unistd.h>
 Index: tests/lib/libc/string/t_strerror.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/string/t_strerror.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_strerror.c
 --- tests/lib/libc/string/t_strerror.c 10 May 2011 06:55:27 -0000      1.3
 +++ tests/lib/libc/string/t_strerror.c 17 May 2013 16:00:42 -0000
 @@ -35,6 +35,7 @@
  #include <errno.h>
  #include <limits.h>
  #include <locale.h>
 +#include <stdio.h>
  #include <string.h>
  
  ATF_TC(strerror_basic);
 Index: tests/lib/libc/sys/t_access.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_access.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_access.c
 --- tests/lib/libc/sys/t_access.c      7 Jul 2011 06:57:53 -0000       1.1
 +++ tests/lib/libc/sys/t_access.c      17 May 2013 16:00:42 -0000
 @@ -31,6 +31,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_access.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
  
 +#include <sys/param.h>
 +#include <sys/stat.h>
  #include <errno.h>
  #include <fcntl.h>
  #include <limits.h>
 Index: tests/lib/libc/sys/t_chroot.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_chroot.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_chroot.c
 --- tests/lib/libc/sys/t_chroot.c      7 Jul 2011 06:57:53 -0000       1.1
 +++ tests/lib/libc/sys/t_chroot.c      17 May 2013 16:00:42 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_chroot.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
  
 +#include <sys/stat.h>
  #include <sys/wait.h>
  
  #include <atf-c.h>
 Index: tests/lib/libc/sys/t_clock_gettime.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_clock_gettime.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_clock_gettime.c
 --- tests/lib/libc/sys/t_clock_gettime.c       15 Oct 2011 06:42:16 -0000      
1.1
 +++ tests/lib/libc/sys/t_clock_gettime.c       17 May 2013 16:00:42 -0000
 @@ -63,17 +63,16 @@
  #include <sys/param.h>
  #include <sys/sysctl.h>
  
 -#include <machine/int_limits.h>
 -
  #include <atf-c.h>
  #include <errno.h>
 +#include <stdint.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include <time.h>
  #include <unistd.h>
  
 -#include "../../../h_macros.h"
 +#include "h_macros.h"
  
  #define MINPOSDIFF    15000000        /* 15 ms for now */
  #define TIMEOUT               5
 Index: tests/lib/libc/sys/t_connect.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_connect.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_connect.c
 --- tests/lib/libc/sys/t_connect.c     5 Nov 2011 18:19:02 -0000       1.1
 +++ tests/lib/libc/sys/t_connect.c     17 May 2013 16:00:42 -0000
 @@ -26,6 +26,7 @@
   * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
 +#include <sys/socket.h>
  #include <err.h>
  #include <errno.h>
  #include <string.h>
 Index: tests/lib/libc/sys/t_dup.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_dup.c,v
 retrieving revision 1.8
 diff -u -r1.8 t_dup.c
 --- tests/lib/libc/sys/t_dup.c 18 Mar 2012 07:00:51 -0000      1.8
 +++ tests/lib/libc/sys/t_dup.c 17 May 2013 16:00:42 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_dup.c,v 1.8 2012/03/18 07:00:51 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <sys/resource.h>
  #include <sys/stat.h>
  #include <sys/wait.h>
 Index: tests/lib/libc/sys/t_getgroups.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_getgroups.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_getgroups.c
 --- tests/lib/libc/sys/t_getgroups.c   7 Jul 2011 06:57:53 -0000       1.1
 +++ tests/lib/libc/sys/t_getgroups.c   17 May 2013 16:00:42 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_getgroups.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <sys/wait.h>
  
  #include <atf-c.h>
 Index: tests/lib/libc/sys/t_getrusage.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_getrusage.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_getrusage.c
 --- tests/lib/libc/sys/t_getrusage.c   22 Aug 2011 00:33:16 -0000      1.2
 +++ tests/lib/libc/sys/t_getrusage.c   17 May 2013 16:00:42 -0000
 @@ -47,7 +47,7 @@
  static const size_t   maxiter = 2000;
  
  static void
 -sighandler(int signo)
 +sighandler(int signo __unused)
  {
        /* Nothing. */
  }
 Index: tests/lib/libc/sys/t_kill.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_kill.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_kill.c
 --- tests/lib/libc/sys/t_kill.c        7 Jul 2011 06:57:53 -0000       1.1
 +++ tests/lib/libc/sys/t_kill.c        17 May 2013 16:00:42 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_kill.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <sys/wait.h>
  
  #include <errno.h>
 Index: tests/lib/libc/sys/t_link.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_link.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_link.c
 --- tests/lib/libc/sys/t_link.c        7 Jul 2011 06:57:53 -0000       1.1
 +++ tests/lib/libc/sys/t_link.c        17 May 2013 16:00:42 -0000
 @@ -37,6 +37,7 @@
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
 +#include <limits.h>
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
 Index: tests/lib/libc/sys/t_listen.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_listen.c,v
 retrieving revision 1.4
 diff -u -r1.4 t_listen.c
 --- tests/lib/libc/sys/t_listen.c      18 Mar 2012 07:00:52 -0000      1.4
 +++ tests/lib/libc/sys/t_listen.c      17 May 2013 16:00:42 -0000
 @@ -26,7 +26,7 @@
   * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
 -#include <atf-c.h>
 +#include <sys/socket.h>
  #include <err.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -36,6 +36,8 @@
  #include <arpa/inet.h>
  #include <netinet/in.h>
  
 +#include <atf-c.h>
 +
  static const char *path = "listen";
  
  ATF_TC_WITH_CLEANUP(listen_err);
 Index: tests/lib/libc/sys/t_mincore.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_mincore.c,v
 retrieving revision 1.8
 diff -u -r1.8 t_mincore.c
 --- tests/lib/libc/sys/t_mincore.c     8 Jun 2012 07:18:58 -0000       1.8
 +++ tests/lib/libc/sys/t_mincore.c     17 May 2013 16:00:42 -0000
 @@ -62,6 +62,7 @@
  __RCSID("$NetBSD: t_mincore.c,v 1.8 2012/06/08 07:18:58 martin Exp $");
  
  #include <sys/mman.h>
 +#include <sys/stat.h>
  #include <sys/shm.h>
  
  #include <atf-c.h>
 Index: tests/lib/libc/sys/t_mmap.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_mmap.c,v
 retrieving revision 1.7
 diff -u -r1.7 t_mmap.c
 --- tests/lib/libc/sys/t_mmap.c        14 Jun 2012 17:47:58 -0000      1.7
 +++ tests/lib/libc/sys/t_mmap.c        17 May 2013 16:00:42 -0000
 @@ -60,6 +60,7 @@
  #include <sys/param.h>
  #include <sys/mman.h>
  #include <sys/socket.h>
 +#include <sys/stat.h>
  #include <sys/sysctl.h>
  #include <sys/wait.h>
  
 @@ -67,12 +68,13 @@
  #include <errno.h>
  #include <fcntl.h>
  #include <signal.h>
 +#include <stdint.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
  #include <paths.h>
 -#include <machine/disklabel.h>
 +#include <sys/disklabel.h>
  
  static long   page = 0;
  static char   path[] = "mmap";
 Index: tests/lib/libc/sys/t_msgctl.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_msgctl.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_msgctl.c
 --- tests/lib/libc/sys/t_msgctl.c      11 Nov 2011 05:06:01 -0000      1.3
 +++ tests/lib/libc/sys/t_msgctl.c      17 May 2013 16:00:43 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_msgctl.c,v 1.3 2011/11/11 05:06:01 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <sys/msg.h>
  #include <sys/stat.h>
  #include <sys/sysctl.h>
 @@ -39,6 +40,7 @@
  #include <atf-c.h>
  #include <errno.h>
  #include <pwd.h>
 +#include <stdint.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 Index: tests/lib/libc/sys/t_msgget.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_msgget.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_msgget.c
 --- tests/lib/libc/sys/t_msgget.c      5 Nov 2011 07:45:41 -0000       1.1
 +++ tests/lib/libc/sys/t_msgget.c      17 May 2013 16:00:43 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_msgget.c,v 1.1 2011/11/05 07:45:41 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <sys/msg.h>
  #include <sys/stat.h>
  #include <sys/sysctl.h>
 @@ -39,6 +40,7 @@
  #include <atf-c.h>
  #include <errno.h>
  #include <pwd.h>
 +#include <stdint.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 Index: tests/lib/libc/sys/t_msgrcv.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_msgrcv.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_msgrcv.c
 --- tests/lib/libc/sys/t_msgrcv.c      11 Nov 2011 05:06:01 -0000      1.2
 +++ tests/lib/libc/sys/t_msgrcv.c      17 May 2013 16:00:43 -0000
 @@ -38,6 +38,7 @@
  
  #include <atf-c.h>
  #include <errno.h>
 +#include <limits.h>
  #include <pwd.h>
  #include <signal.h>
  #include <stdio.h>
 Index: tests/lib/libc/sys/t_msgsnd.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_msgsnd.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_msgsnd.c
 --- tests/lib/libc/sys/t_msgsnd.c      5 Nov 2011 08:47:54 -0000       1.2
 +++ tests/lib/libc/sys/t_msgsnd.c      17 May 2013 16:00:43 -0000
 @@ -38,6 +38,7 @@
  
  #include <atf-c.h>
  #include <errno.h>
 +#include <limits.h>
  #include <pwd.h>
  #include <signal.h>
  #include <stdio.h>
 Index: tests/lib/libc/sys/t_pipe.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_pipe.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_pipe.c
 --- tests/lib/libc/sys/t_pipe.c        31 Oct 2011 15:41:31 -0000      1.3
 +++ tests/lib/libc/sys/t_pipe.c        17 May 2013 16:00:43 -0000
 @@ -45,7 +45,7 @@
  
  #include <atf-c.h>
  
 -#include "../../../h_macros.h"
 +#include "h_macros.h"
  
  static pid_t pid;
  static int nsiginfo = 0;
 Index: tests/lib/libc/sys/t_pipe2.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_pipe2.c,v
 retrieving revision 1.8
 diff -u -r1.8 t_pipe2.c
 --- tests/lib/libc/sys/t_pipe2.c       16 May 2012 13:54:28 -0000      1.8
 +++ tests/lib/libc/sys/t_pipe2.c       17 May 2013 16:00:43 -0000
 @@ -38,6 +38,8 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_pipe2.c,v 1.8 2012/05/16 13:54:28 jruoho Exp $");
  
 +#include <sys/param.h>
 +#include <sys/socket.h>
  #include <atf-c.h>
  #include <fcntl.h>
  #include <unistd.h>
 Index: tests/lib/libc/sys/t_posix_fadvise.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_posix_fadvise.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_posix_fadvise.c
 --- tests/lib/libc/sys/t_posix_fadvise.c       15 Oct 2011 06:10:26 -0000      
1.1
 +++ tests/lib/libc/sys/t_posix_fadvise.c       17 May 2013 16:00:43 -0000
 @@ -68,7 +68,7 @@
  
  #include <atf-c.h>
  
 -#include "../../../h_macros.h"
 +#include "h_macros.h"
  
  #include <rump/rump.h>
  #include <rump/rump_syscalls.h>
 Index: tests/lib/libc/sys/t_select.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_select.c,v
 retrieving revision 1.3
 diff -u -r1.3 t_select.c
 --- tests/lib/libc/sys/t_select.c      18 Mar 2012 07:00:52 -0000      1.3
 +++ tests/lib/libc/sys/t_select.c      17 May 2013 16:00:43 -0000
 @@ -29,10 +29,10 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  
 -#include <assert.h>
 -#include <sys/types.h>
 +#include <sys/param.h>
  #include <sys/select.h>
  #include <sys/wait.h>
 +#include <assert.h>
  #include <err.h>
  #include <stdio.h>
  #include <string.h>
 @@ -47,13 +47,13 @@
  static sig_atomic_t keep_going = 1;
  
  static void
 -sig_handler(int signum)
 +sig_handler(int signum __unused)
  {
        keep_going = 0;
  }
  
  static void
 -sigchld(int signum)
 +sigchld(int signum __unused)
  {
  }
  
 Index: tests/lib/libc/sys/t_setrlimit.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_setrlimit.c,v
 retrieving revision 1.4
 diff -u -r1.4 t_setrlimit.c
 --- tests/lib/libc/sys/t_setrlimit.c   12 Jun 2012 23:56:19 -0000      1.4
 +++ tests/lib/libc/sys/t_setrlimit.c   17 May 2013 16:00:43 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_setrlimit.c,v 1.4 2012/06/12 23:56:19 christos Exp $");
  
 +#include <sys/param.h>
  #include <sys/resource.h>
  #include <sys/mman.h>
  #include <sys/wait.h>
 Index: tests/lib/libc/sys/t_sigaction.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_sigaction.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_sigaction.c
 --- tests/lib/libc/sys/t_sigaction.c   7 Nov 2012 16:51:16 -0000       1.2
 +++ tests/lib/libc/sys/t_sigaction.c   17 May 2013 16:00:43 -0000
 @@ -42,12 +42,12 @@
  #include <atf-c.h>
  #include <atf-c/config.h>
  
 -#include "../../../h_macros.h"
 +#include "h_macros.h"
  
  static bool handler_called = false;
  
  static void
 -handler(int signo)
 +handler(int signo __unused)
  {
      handler_called = true;
  }
 @@ -80,7 +80,7 @@
  }
  
  static void
 -catch(int sig)
 +catch(int sig __unused)
  {
        return;
  }
 Index: tests/lib/libc/sys/t_sigqueue.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_sigqueue.c,v
 retrieving revision 1.4
 diff -u -r1.4 t_sigqueue.c
 --- tests/lib/libc/sys/t_sigqueue.c    7 Jul 2011 16:31:11 -0000       1.4
 +++ tests/lib/libc/sys/t_sigqueue.c    17 May 2013 16:00:43 -0000
 @@ -46,7 +46,7 @@
  static int value;
  
  static void
 -handler(int signo, siginfo_t *info, void *data)
 +handler(int signo __unused, siginfo_t *info, void *data __unused)
  {
        value = info->si_value.sival_int;
        kill(0, SIGINFO);
 Index: tests/lib/libc/sys/t_stat.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_stat.c,v
 retrieving revision 1.4
 diff -u -r1.4 t_stat.c
 --- tests/lib/libc/sys/t_stat.c        17 Mar 2012 08:37:08 -0000      1.4
 +++ tests/lib/libc/sys/t_stat.c        17 May 2013 16:00:43 -0000
 @@ -31,22 +31,22 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_stat.c,v 1.4 2012/03/17 08:37:08 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <sys/stat.h>
  #include <sys/socket.h>
 -#include <sys/types.h>
  
  #include <arpa/inet.h>
 +#include <netinet/in.h>
  
  #include <atf-c.h>
  #include <errno.h>
  #include <fcntl.h>
  #include <fts.h>
  #include <limits.h>
 +#include <stdio.h>
  #include <string.h>
  #include <unistd.h>
  
 -#include <stdio.h>
 -
  static const char *path = "stat";
  
  ATF_TC_WITH_CLEANUP(stat_chflags);
 Index: tests/lib/libc/sys/t_timer_create.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_timer_create.c,v
 retrieving revision 1.4
 diff -u -r1.4 t_timer_create.c
 --- tests/lib/libc/sys/t_timer_create.c        18 Mar 2012 07:00:52 -0000      
1.4
 +++ tests/lib/libc/sys/t_timer_create.c        17 May 2013 16:00:43 -0000
 @@ -38,7 +38,7 @@
  static bool fail = true;
  
  static void
 -timer_signal_handler(int signo, siginfo_t *si, void *osi)
 +timer_signal_handler(int signo, siginfo_t *si, void *osi __unused)
  {
        timer_t *tp;
  
 Index: tests/lib/libc/sys/t_truncate.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_truncate.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_truncate.c
 --- tests/lib/libc/sys/t_truncate.c    18 Aug 2011 19:48:03 -0000      1.2
 +++ tests/lib/libc/sys/t_truncate.c    17 May 2013 16:00:43 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_truncate.c,v 1.2 2011/08/18 19:48:03 dholland Exp $");
  
 +#include <sys/param.h>
  #include <sys/stat.h>
  
  #include <atf-c.h>
 Index: tests/lib/libc/sys/t_umask.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_umask.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_umask.c
 --- tests/lib/libc/sys/t_umask.c       7 Jul 2011 06:57:54 -0000       1.1
 +++ tests/lib/libc/sys/t_umask.c       17 May 2013 16:00:43 -0000
 @@ -31,6 +31,7 @@
  #include <sys/cdefs.h>
  __RCSID("$NetBSD: t_umask.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $");
  
 +#include <sys/param.h>
  #include <sys/stat.h>
  #include <sys/wait.h>
  
 Index: tests/lib/libc/sys/t_write.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/sys/t_write.c,v
 retrieving revision 1.2
 diff -u -r1.2 t_write.c
 --- tests/lib/libc/sys/t_write.c       19 Oct 2011 16:19:30 -0000      1.2
 +++ tests/lib/libc/sys/t_write.c       17 May 2013 16:00:43 -0000
 @@ -32,7 +32,7 @@
  __RCSID("$NetBSD: t_write.c,v 1.2 2011/10/19 16:19:30 jruoho Exp $");
  
  #include <sys/uio.h>
 -#include <sys/syslimits.h>
 +#include <limits.h>
  
  #include <atf-c.h>
  #include <errno.h>
 @@ -49,7 +49,7 @@
  static const char     *path = "write";
  
  static void
 -sighandler(int signo)
 +sighandler(int signo __unused)
  {
        fail = false;
  }
 Index: tests/lib/libc/time/t_strptime.c
 ===================================================================
 RCS file: /cvsroot/src/tests/lib/libc/time/t_strptime.c,v
 retrieving revision 1.1
 diff -u -r1.1 t_strptime.c
 --- tests/lib/libc/time/t_strptime.c   13 Jan 2011 00:14:10 -0000      1.1
 +++ tests/lib/libc/time/t_strptime.c   17 May 2013 16:00:43 -0000
 @@ -57,7 +57,7 @@
                ATF_REQUIRE_MSG(tm.field == field,                      \
                    "strptime(\"%s\", \"%s\", tm): incorrect %s: "      \
                    "expected: %d, but got: %d", buf, fmt,              \
 -                  ___STRING(field), field, tm.field)
 +                  __STRING(field), field, tm.field)
  
        H_REQUIRE_FIELD(tm_sec);
        H_REQUIRE_FIELD(tm_min);
 
 --Apple-Mail=_0E583C49-25B9-45D5-B267-BB90A76B8167--
Follow-Ups:
- Re: misc/47827: [PATCH] improve portability of NetBSD libc testcases
  - From: Garrett Cooper
Prev by Date: misc/47827: [PATCH] improve portability of NetBSD libc testcases
Next by Date: Re: misc/47827: [PATCH] improve portability of NetBSD libc testcases
Previous by Thread: misc/47827: [PATCH] improve portability of NetBSD libc testcases
Next by Thread: Re: misc/47827: [PATCH] improve portability of NetBSD libc testcases
Indexes:
Home | Main Index | Thread Index | Old Index