svn commit: r312106 - in vendor/NetBSD/tests/dist: dev/cgd dev/scsipi dev/sysmon fs/common fs/ffs fs/hfs fs/kernfs fs/lfs fs/msdosfs fs/nfs fs/nullfs fs/ptyfs fs/puffs fs/tmpfs fs/umapfs fs/union f...

Ngie Cooper ngie at FreeBSD.org
Sat Jan 14 02:26:53 UTC 2017 

Author: ngie
Date: Sat Jan 14 02:26:46 2017
New Revision: 312106
URL: https://svnweb.freebsd.org/changeset/base/312106

Log:
  Commit more accepted upstream changes from <NetBSD>/tests/...
  
  This includes a number of accepted patches for:
  - lib/libc/sys
  - lib/libm
  
  christos was also nice enough to do the heavy lifting with the h_macros.h
  #includes so testcases which use h_macros.h now can work more easily with
  the FreeBSD tree's layout for contrib/netbsd-tests vs the testcases.

Modified:
  vendor/NetBSD/tests/dist/dev/cgd/t_cgd_3des.c
  vendor/NetBSD/tests/dist/dev/cgd/t_cgd_aes.c
  vendor/NetBSD/tests/dist/dev/cgd/t_cgd_blowfish.c
  vendor/NetBSD/tests/dist/dev/scsipi/t_cd.c
  vendor/NetBSD/tests/dist/dev/sysmon/t_swwdog.c
  vendor/NetBSD/tests/dist/fs/common/h_fsmacros.h
  vendor/NetBSD/tests/dist/fs/ffs/h_quota2_tests.c
  vendor/NetBSD/tests/dist/fs/ffs/t_fifos.c
  vendor/NetBSD/tests/dist/fs/ffs/t_mount.c
  vendor/NetBSD/tests/dist/fs/ffs/t_quota2_1.c
  vendor/NetBSD/tests/dist/fs/ffs/t_quota2_remount.c
  vendor/NetBSD/tests/dist/fs/ffs/t_snapshot.c
  vendor/NetBSD/tests/dist/fs/ffs/t_snapshot_log.c
  vendor/NetBSD/tests/dist/fs/ffs/t_snapshot_v2.c
  vendor/NetBSD/tests/dist/fs/hfs/t_pathconvert.c
  vendor/NetBSD/tests/dist/fs/kernfs/t_basic.c
  vendor/NetBSD/tests/dist/fs/lfs/t_pr.c
  vendor/NetBSD/tests/dist/fs/msdosfs/t_snapshot.c
  vendor/NetBSD/tests/dist/fs/nfs/t_mountd.c
  vendor/NetBSD/tests/dist/fs/nullfs/t_basic.c
  vendor/NetBSD/tests/dist/fs/ptyfs/t_nullpts.c
  vendor/NetBSD/tests/dist/fs/ptyfs/t_ptyfs.c
  vendor/NetBSD/tests/dist/fs/puffs/t_basic.c
  vendor/NetBSD/tests/dist/fs/puffs/t_fuzz.c
  vendor/NetBSD/tests/dist/fs/puffs/t_io.c
  vendor/NetBSD/tests/dist/fs/tmpfs/t_renamerace.c
  vendor/NetBSD/tests/dist/fs/umapfs/t_basic.c
  vendor/NetBSD/tests/dist/fs/union/t_pr.c
  vendor/NetBSD/tests/dist/fs/vfs/t_full.c
  vendor/NetBSD/tests/dist/fs/vfs/t_io.c
  vendor/NetBSD/tests/dist/fs/vfs/t_renamerace.c
  vendor/NetBSD/tests/dist/fs/vfs/t_ro.c
  vendor/NetBSD/tests/dist/fs/vfs/t_union.c
  vendor/NetBSD/tests/dist/fs/vfs/t_unpriv.c
  vendor/NetBSD/tests/dist/fs/vfs/t_vfsops.c
  vendor/NetBSD/tests/dist/fs/vfs/t_vnops.c
  vendor/NetBSD/tests/dist/include/sys/t_socket.c
  vendor/NetBSD/tests/dist/kernel/kqueue/read/t_fifo.c
  vendor/NetBSD/tests/dist/kernel/kqueue/read/t_file.c
  vendor/NetBSD/tests/dist/kernel/kqueue/read/t_file2.c
  vendor/NetBSD/tests/dist/kernel/kqueue/read/t_pipe.c
  vendor/NetBSD/tests/dist/kernel/kqueue/read/t_ttypty.c
  vendor/NetBSD/tests/dist/kernel/kqueue/t_ioctl.c
  vendor/NetBSD/tests/dist/kernel/kqueue/t_proc1.c
  vendor/NetBSD/tests/dist/kernel/kqueue/t_proc2.c
  vendor/NetBSD/tests/dist/kernel/kqueue/t_proc3.c
  vendor/NetBSD/tests/dist/kernel/kqueue/t_sig.c
  vendor/NetBSD/tests/dist/kernel/kqueue/write/t_fifo.c
  vendor/NetBSD/tests/dist/kernel/kqueue/write/t_pipe.c
  vendor/NetBSD/tests/dist/kernel/kqueue/write/t_ttypty.c
  vendor/NetBSD/tests/dist/kernel/t_extent.c
  vendor/NetBSD/tests/dist/kernel/t_filedesc.c
  vendor/NetBSD/tests/dist/kernel/t_lock.c
  vendor/NetBSD/tests/dist/kernel/t_ptrace.c
  vendor/NetBSD/tests/dist/kernel/t_ptrace_wait.c
  vendor/NetBSD/tests/dist/kernel/t_pty.c
  vendor/NetBSD/tests/dist/kernel/t_rnd.c
  vendor/NetBSD/tests/dist/lib/libc/gen/t_glob.c
  vendor/NetBSD/tests/dist/lib/libc/regex/debug.c
  vendor/NetBSD/tests/dist/lib/libc/regex/t_exhaust.c
  vendor/NetBSD/tests/dist/lib/libc/regex/t_regex_att.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_clock_gettime.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_connect.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_dup.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_getrusage.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_link.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_listen.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_mmap.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_msgctl.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_msgrcv.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_msgsnd.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_nanosleep.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_pipe.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_pipe2.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_posix_fadvise.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_revoke.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_select.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_setrlimit.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_sigaction.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_sigqueue.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_socketpair.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_stat.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_truncate.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_umask.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_unlink.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_wait.c
  vendor/NetBSD/tests/dist/lib/libc/sys/t_write.c
  vendor/NetBSD/tests/dist/lib/libm/t_ilogb.c
  vendor/NetBSD/tests/dist/lib/libm/t_scalbn.c
  vendor/NetBSD/tests/dist/lib/libposix/t_rename.c
  vendor/NetBSD/tests/dist/lib/librumpclient/t_fd.c
  vendor/NetBSD/tests/dist/lib/semaphore/sem.c
  vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_dlerror-cleared.c
  vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_dlerror-false.c
  vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_dlinfo.c
  vendor/NetBSD/tests/dist/libexec/ld.elf_so/t_ifunc.c
  vendor/NetBSD/tests/dist/modules/t_builtin.c
  vendor/NetBSD/tests/dist/net/bpf/t_bpf.c
  vendor/NetBSD/tests/dist/net/bpf/t_mbuf.c
  vendor/NetBSD/tests/dist/net/bpfilter/t_bpfilter.c
  vendor/NetBSD/tests/dist/net/bpfjit/t_bpfjit.c
  vendor/NetBSD/tests/dist/net/bpfjit/t_cop.c
  vendor/NetBSD/tests/dist/net/bpfjit/t_extmem.c
  vendor/NetBSD/tests/dist/net/bpfjit/t_mbuf.c
  vendor/NetBSD/tests/dist/net/carp/t_basic.c
  vendor/NetBSD/tests/dist/net/config/netconfig.c
  vendor/NetBSD/tests/dist/net/icmp/t_forward.c
  vendor/NetBSD/tests/dist/net/icmp/t_ping.c
  vendor/NetBSD/tests/dist/net/if_loop/t_pr.c
  vendor/NetBSD/tests/dist/net/ndp/t_ra.sh
  vendor/NetBSD/tests/dist/net/net/t_raw.c
  vendor/NetBSD/tests/dist/rump/modautoload/t_modautoload.c
  vendor/NetBSD/tests/dist/rump/rumpkern/t_kern.c
  vendor/NetBSD/tests/dist/rump/rumpkern/t_lwproc.c
  vendor/NetBSD/tests/dist/rump/rumpkern/t_modcmd.c
  vendor/NetBSD/tests/dist/rump/rumpkern/t_modlinkset.c
  vendor/NetBSD/tests/dist/rump/rumpkern/t_signals.c
  vendor/NetBSD/tests/dist/rump/rumpkern/t_threads.c
  vendor/NetBSD/tests/dist/rump/rumpkern/t_tsleep.c
  vendor/NetBSD/tests/dist/rump/rumpkern/t_vm.c
  vendor/NetBSD/tests/dist/rump/rumpvfs/t_basic.c
  vendor/NetBSD/tests/dist/rump/rumpvfs/t_etfs.c
  vendor/NetBSD/tests/dist/rump/rumpvfs/t_p2kifs.c

Modified: vendor/NetBSD/tests/dist/dev/cgd/t_cgd_3des.c
==============================================================================
--- vendor/NetBSD/tests/dist/dev/cgd/t_cgd_3des.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/dev/cgd/t_cgd_3des.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_cgd_3des.c,v 1.1 2016/11/11 07:39:58 alnsn Exp $	*/
+/*	$NetBSD: t_cgd_3des.c,v 1.2 2017/01/13 21:30:39 christos Exp $	*/
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -48,7 +48,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define SECSIZE 512
 

Modified: vendor/NetBSD/tests/dist/dev/cgd/t_cgd_aes.c
==============================================================================
--- vendor/NetBSD/tests/dist/dev/cgd/t_cgd_aes.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/dev/cgd/t_cgd_aes.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_cgd_aes.c,v 1.5 2016/12/11 00:23:44 alnsn Exp $	*/
+/*	$NetBSD: t_cgd_aes.c,v 1.6 2017/01/13 21:30:39 christos Exp $	*/
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * Copyright (c) 2007 The Institute of Electrical and Electronics Engineers, Inc
@@ -49,7 +49,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define SECSIZE 512
 

Modified: vendor/NetBSD/tests/dist/dev/cgd/t_cgd_blowfish.c
==============================================================================
--- vendor/NetBSD/tests/dist/dev/cgd/t_cgd_blowfish.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/dev/cgd/t_cgd_blowfish.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_cgd_blowfish.c,v 1.1 2016/11/10 23:44:36 alnsn Exp $	*/
+/*	$NetBSD: t_cgd_blowfish.c,v 1.2 2017/01/13 21:30:39 christos Exp $	*/
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -48,7 +48,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define SECSIZE 512
 

Modified: vendor/NetBSD/tests/dist/dev/scsipi/t_cd.c
==============================================================================
--- vendor/NetBSD/tests/dist/dev/scsipi/t_cd.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/dev/scsipi/t_cd.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_cd.c,v 1.7 2014/04/25 00:24:39 pooka Exp $	*/
+/*	$NetBSD: t_cd.c,v 1.8 2017/01/13 21:30:39 christos Exp $	*/
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -39,7 +39,7 @@
 
 #include "scsitest.h"
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(noisyeject);
 ATF_TC_HEAD(noisyeject, tc)

Modified: vendor/NetBSD/tests/dist/dev/sysmon/t_swwdog.c
==============================================================================
--- vendor/NetBSD/tests/dist/dev/sysmon/t_swwdog.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/dev/sysmon/t_swwdog.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_swwdog.c,v 1.6 2015/04/23 04:49:37 pgoyette Exp $	*/
+/*	$NetBSD: t_swwdog.c,v 1.7 2017/01/13 21:30:39 christos Exp $	*/
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -43,7 +43,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 static volatile sig_atomic_t tcount;
 

Modified: vendor/NetBSD/tests/dist/fs/common/h_fsmacros.h
==============================================================================
--- vendor/NetBSD/tests/dist/fs/common/h_fsmacros.h	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/common/h_fsmacros.h	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: h_fsmacros.h,v 1.40 2015/08/29 19:19:43 dholland Exp $	*/
+/*	$NetBSD: h_fsmacros.h,v 1.41 2017/01/13 21:30:39 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 #include <rump/rump.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define FSPROTOS(_fs_)							\
 int _fs_##_fstest_newfs(const atf_tc_t *, void **, const char *,	\

Modified: vendor/NetBSD/tests/dist/fs/ffs/h_quota2_tests.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/ffs/h_quota2_tests.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/ffs/h_quota2_tests.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: h_quota2_tests.c,v 1.4 2012/09/30 21:26:57 bouyer Exp $	*/
+/*	$NetBSD: h_quota2_tests.c,v 1.5 2017/01/13 21:30:39 christos Exp $	*/
 
 /*
  * rump server for advanced quota tests
@@ -22,7 +22,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 int background = 0;
 

Modified: vendor/NetBSD/tests/dist/fs/ffs/t_fifos.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/ffs/t_fifos.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/ffs/t_fifos.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_fifos.c,v 1.5 2010/11/07 17:51:17 jmmv Exp $	*/
+/*	$NetBSD: t_fifos.c,v 1.6 2017/01/13 21:30:39 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -17,7 +17,7 @@
 
 #include <ufs/ufs/ufsmount.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC_WITH_CLEANUP(fifos);
 ATF_TC_HEAD(fifos, tc)

Modified: vendor/NetBSD/tests/dist/fs/ffs/t_mount.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/ffs/t_mount.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/ffs/t_mount.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_mount.c,v 1.13 2012/11/27 16:01:49 jakllsch Exp $	*/
+/*	$NetBSD: t_mount.c,v 1.14 2017/01/13 21:30:39 christos Exp $	*/
 
 /*
  * Basic tests for mounting
@@ -25,7 +25,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(48Kimage);
 ATF_TC_HEAD(48Kimage, tc)

Modified: vendor/NetBSD/tests/dist/fs/ffs/t_quota2_1.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/ffs/t_quota2_1.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/ffs/t_quota2_1.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_quota2_1.c,v 1.4 2012/03/15 02:02:22 joerg Exp $	*/
+/*	$NetBSD: t_quota2_1.c,v 1.5 2017/01/13 21:30:39 christos Exp $	*/
 
 /*
  * Basic tests for quota2
@@ -18,7 +18,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 static void
 do_quota(const atf_tc_t *tc, int n, const char *newfs_opts, int log)

Modified: vendor/NetBSD/tests/dist/fs/ffs/t_quota2_remount.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/ffs/t_quota2_remount.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/ffs/t_quota2_remount.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_quota2_remount.c,v 1.4 2012/03/15 02:02:22 joerg Exp $	*/
+/*	$NetBSD: t_quota2_remount.c,v 1.5 2017/01/13 21:30:39 christos Exp $	*/
 
 /*
  * Basic tests for quota2
@@ -19,7 +19,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 static void
 do_quota(const atf_tc_t *tc, int n, const char *newfs_opts, int log)

Modified: vendor/NetBSD/tests/dist/fs/ffs/t_snapshot.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/ffs/t_snapshot.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/ffs/t_snapshot.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_snapshot.c,v 1.6 2013/02/06 09:05:01 hannken Exp $	*/
+/*	$NetBSD: t_snapshot.c,v 1.7 2017/01/13 21:30:39 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define IMGNAME "ffs.img"
 #define NEWFS "newfs -F -s 10000 " IMGNAME

Modified: vendor/NetBSD/tests/dist/fs/ffs/t_snapshot_log.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/ffs/t_snapshot_log.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/ffs/t_snapshot_log.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_snapshot_log.c,v 1.2 2013/02/06 09:05:01 hannken Exp $	*/
+/*	$NetBSD: t_snapshot_log.c,v 1.3 2017/01/13 21:30:39 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define IMGNAME "ffs.img"
 #define NEWFS "newfs -F -s 10000 " IMGNAME

Modified: vendor/NetBSD/tests/dist/fs/ffs/t_snapshot_v2.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/ffs/t_snapshot_v2.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/ffs/t_snapshot_v2.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_snapshot_v2.c,v 1.2 2013/02/06 09:05:01 hannken Exp $	*/
+/*	$NetBSD: t_snapshot_v2.c,v 1.3 2017/01/13 21:30:39 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define IMGNAME "ffs.img"
 #define NEWFS "newfs -F -s 10000 -O 2 " IMGNAME

Modified: vendor/NetBSD/tests/dist/fs/hfs/t_pathconvert.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/hfs/t_pathconvert.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/hfs/t_pathconvert.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_pathconvert.c,v 1.5 2011/02/25 20:54:18 martin Exp $	*/
+/*	$NetBSD: t_pathconvert.c,v 1.6 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -18,7 +18,7 @@
 
 #include <fs/hfs/hfs.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(colonslash);
 ATF_TC_HEAD(colonslash, tc)

Modified: vendor/NetBSD/tests/dist/fs/kernfs/t_basic.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/kernfs/t_basic.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/kernfs/t_basic.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_basic.c,v 1.3 2010/05/31 23:44:54 pooka Exp $	*/
+/*	$NetBSD: t_basic.c,v 1.4 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -20,7 +20,7 @@
 
 #include <miscfs/kernfs/kernfs.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(getdents);
 ATF_TC_HEAD(getdents, tc)

Modified: vendor/NetBSD/tests/dist/fs/lfs/t_pr.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/lfs/t_pr.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/lfs/t_pr.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_pr.c,v 1.6 2011/02/22 18:41:05 pooka Exp $	*/
+/*	$NetBSD: t_pr.c,v 1.7 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -17,7 +17,7 @@
 
 #include <ufs/ufs/ufsmount.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(mknod);
 ATF_TC_HEAD(mknod, tc)

Modified: vendor/NetBSD/tests/dist/fs/msdosfs/t_snapshot.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/msdosfs/t_snapshot.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/msdosfs/t_snapshot.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_snapshot.c,v 1.3 2014/06/10 13:15:18 martin Exp $	*/
+/*	$NetBSD: t_snapshot.c,v 1.4 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define IMGNAME "msdosfs.img"
 #define NEWFS "newfs_msdos -C 5M " IMGNAME

Modified: vendor/NetBSD/tests/dist/fs/nfs/t_mountd.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/nfs/t_mountd.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/nfs/t_mountd.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_mountd.c,v 1.5 2012/02/24 13:53:46 joerg Exp $	*/
+/*	$NetBSD: t_mountd.c,v 1.6 2017/01/13 21:30:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 #include "../common/h_fsmacros.h"
 
 ATF_TC(mountdhup);

Modified: vendor/NetBSD/tests/dist/fs/nullfs/t_basic.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/nullfs/t_basic.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/nullfs/t_basic.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_basic.c,v 1.3 2010/06/09 08:37:16 pooka Exp $	*/
+/*	$NetBSD: t_basic.c,v 1.4 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -18,7 +18,7 @@
 #include <miscfs/nullfs/null.h>
 #include <fs/tmpfs/tmpfs_args.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(basic);
 ATF_TC_HEAD(basic, tc)

Modified: vendor/NetBSD/tests/dist/fs/ptyfs/t_nullpts.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/ptyfs/t_nullpts.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/ptyfs/t_nullpts.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_nullpts.c,v 1.5 2011/01/10 11:11:04 hannken Exp $	*/
+/*	$NetBSD: t_nullpts.c,v 1.6 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -19,7 +19,7 @@
 #include <fs/ptyfs/ptyfs.h>
 #include <miscfs/nullfs/null.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 static void
 mountptyfs(const char *mp, int flags)

Modified: vendor/NetBSD/tests/dist/fs/ptyfs/t_ptyfs.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/ptyfs/t_ptyfs.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/ptyfs/t_ptyfs.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptyfs.c,v 1.1 2010/06/11 23:52:38 pooka Exp $	*/
+/*	$NetBSD: t_ptyfs.c,v 1.2 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -17,7 +17,7 @@
 
 #include <fs/ptyfs/ptyfs.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 static void
 mountptyfs(const char *mp, int flags)

Modified: vendor/NetBSD/tests/dist/fs/puffs/t_basic.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/puffs/t_basic.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/puffs/t_basic.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_basic.c,v 1.13 2016/12/01 14:49:04 hannken Exp $	*/
+/*	$NetBSD: t_basic.c,v 1.14 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -20,7 +20,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 #include "../common/h_fsmacros.h"
 
 /*

Modified: vendor/NetBSD/tests/dist/fs/puffs/t_fuzz.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/puffs/t_fuzz.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/puffs/t_fuzz.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_fuzz.c,v 1.5 2012/04/21 01:03:46 manu Exp $	*/
+/*	$NetBSD: t_fuzz.c,v 1.6 2017/01/13 21:30:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define ITERATIONS 100
 

Modified: vendor/NetBSD/tests/dist/fs/puffs/t_io.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/puffs/t_io.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/puffs/t_io.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_io.c,v 1.1 2010/11/12 17:33:28 pooka Exp $	*/
+/*	$NetBSD: t_io.c,v 1.2 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -20,7 +20,7 @@
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 #include "../common/h_fsmacros.h"
 
 #define MAKEOPTS(...) \

Modified: vendor/NetBSD/tests/dist/fs/tmpfs/t_renamerace.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/tmpfs/t_renamerace.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/tmpfs/t_renamerace.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_renamerace.c,v 1.13 2011/08/18 21:44:55 riastradh Exp $	*/
+/*	$NetBSD: t_renamerace.c,v 1.14 2017/01/13 21:30:40 christos Exp $	*/
 
 /*
  * Modified for rump and atf from a program supplied
@@ -23,7 +23,7 @@
 
 #include <fs/tmpfs/tmpfs_args.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(renamerace2);
 ATF_TC_HEAD(renamerace2, tc)

Modified: vendor/NetBSD/tests/dist/fs/umapfs/t_basic.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/umapfs/t_basic.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/umapfs/t_basic.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_basic.c,v 1.4 2010/07/19 15:35:39 pooka Exp $	*/
+/*	$NetBSD: t_basic.c,v 1.5 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -20,7 +20,7 @@
 #include <fs/tmpfs/tmpfs_args.h>
 #include <miscfs/umapfs/umap.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(basic);
 ATF_TC_HEAD(basic, tc)

Modified: vendor/NetBSD/tests/dist/fs/union/t_pr.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/union/t_pr.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/union/t_pr.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_pr.c,v 1.8 2011/08/10 06:27:02 hannken Exp $	*/
+/*	$NetBSD: t_pr.c,v 1.9 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -17,7 +17,7 @@
 
 #include <miscfs/union/union.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(multilayer);
 ATF_TC_HEAD(multilayer, tc)

Modified: vendor/NetBSD/tests/dist/fs/vfs/t_full.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/vfs/t_full.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/vfs/t_full.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_full.c,v 1.8 2013/03/16 05:45:37 jmmv Exp $	*/
+/*	$NetBSD: t_full.c,v 1.9 2017/01/13 21:30:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include <rump/rump.h>
 
 #include "../common/h_fsmacros.h"
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 /*
  * Write this much over the image size.  This is to force an NFS commit,

Modified: vendor/NetBSD/tests/dist/fs/vfs/t_io.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/vfs/t_io.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/vfs/t_io.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_io.c,v 1.16 2015/04/04 12:34:44 riastradh Exp $	*/
+/*	$NetBSD: t_io.c,v 1.17 2017/01/13 21:30:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include <rump/rump.h>
 
 #include "../common/h_fsmacros.h"
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define TESTSTR "this is a string.  collect enough and you'll have Em"
 #define TESTSZ sizeof(TESTSTR)

Modified: vendor/NetBSD/tests/dist/fs/vfs/t_renamerace.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/vfs/t_renamerace.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/vfs/t_renamerace.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_renamerace.c,v 1.33 2016/05/04 08:30:22 dholland Exp $	*/
+/*	$NetBSD: t_renamerace.c,v 1.34 2017/01/13 21:30:40 christos Exp $	*/
 
 /*
  * Modified for rump and atf from a program supplied
@@ -34,7 +34,7 @@
 #define FSTEST_IMGSIZE (50000 * 512)
 
 #include "../common/h_fsmacros.h"
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 static volatile int quittingtime;
 pid_t wrkpid;

Modified: vendor/NetBSD/tests/dist/fs/vfs/t_ro.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/vfs/t_ro.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/vfs/t_ro.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ro.c,v 1.5 2011/02/22 21:23:19 yamt Exp $	*/
+/*	$NetBSD: t_ro.c,v 1.6 2017/01/13 21:30:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include <rump/rump.h>
 
 #include "../common/h_fsmacros.h"
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define AFILE "testfile"
 #define ADIR "testdir"

Modified: vendor/NetBSD/tests/dist/fs/vfs/t_union.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/vfs/t_union.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/vfs/t_union.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_union.c,v 1.8 2011/08/07 06:01:51 hannken Exp $	*/
+/*	$NetBSD: t_union.c,v 1.9 2017/01/13 21:30:40 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -17,7 +17,7 @@
 
 #include <miscfs/union/union.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 #include "../common/h_fsmacros.h"
 
 #define MSTR "magic bus"

Modified: vendor/NetBSD/tests/dist/fs/vfs/t_unpriv.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/vfs/t_unpriv.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/vfs/t_unpriv.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_unpriv.c,v 1.12 2015/04/09 19:51:13 riastradh Exp $	*/
+/*	$NetBSD: t_unpriv.c,v 1.13 2017/01/13 21:30:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 #include <rump/rump.h>
 
 #include "../common/h_fsmacros.h"
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define USES_OWNER							 \
 	if (FSTYPE_MSDOS(tc))						 \

Modified: vendor/NetBSD/tests/dist/fs/vfs/t_vfsops.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/vfs/t_vfsops.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/vfs/t_vfsops.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_vfsops.c,v 1.11 2011/04/04 19:16:58 hannken Exp $	*/
+/*	$NetBSD: t_vfsops.c,v 1.12 2017/01/13 21:30:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include <rump/rump.h>
 
 #include "../common/h_fsmacros.h"
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 static void
 tmount(const atf_tc_t *tc, const char *path)

Modified: vendor/NetBSD/tests/dist/fs/vfs/t_vnops.c
==============================================================================
--- vendor/NetBSD/tests/dist/fs/vfs/t_vnops.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/fs/vfs/t_vnops.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_vnops.c,v 1.58 2016/08/29 02:31:46 kre Exp $	*/
+/*	$NetBSD: t_vnops.c,v 1.59 2017/01/13 21:30:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 #include <rump/rump.h>
 
 #include "../common/h_fsmacros.h"
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define TESTFILE "afile"
 

Modified: vendor/NetBSD/tests/dist/include/sys/t_socket.c
==============================================================================
--- vendor/NetBSD/tests/dist/include/sys/t_socket.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/include/sys/t_socket.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_socket.c,v 1.4 2015/02/27 08:30:30 martin Exp $	*/
+/*	$NetBSD: t_socket.c,v 1.5 2017/01/13 21:30:41 christos Exp $	*/
 
 #include <sys/types.h>
 #include <sys/mount.h>
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <util.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(cmsg_sendfd_bounds);
 ATF_TC_HEAD(cmsg_sendfd_bounds, tc)

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/read/t_fifo.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/read/t_fifo.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/read/t_fifo.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fifo.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $ */
+/* $NetBSD: t_fifo.c,v 1.4 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_fifo.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $");
+__RCSID("$NetBSD: t_fifo.c,v 1.4 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 #include <sys/stat.h>
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: t_fifo.c,v 1.3 2010/11
 
 #include <atf-c.h>
 
-#include "../../../h_macros.h"
+#include "h_macros.h"
 
 #define FIFONAME "fifo"
 

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/read/t_file.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/read/t_file.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/read/t_file.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_file.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $ */
+/* $NetBSD: t_file.c,v 1.4 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_file.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $");
+__RCSID("$NetBSD: t_file.c,v 1.4 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/event.h>
@@ -50,7 +50,7 @@ __RCSID("$NetBSD: t_file.c,v 1.3 2010/11
 
 #include <atf-c.h>
 
-#include "../../../h_macros.h"
+#include "h_macros.h"
 
 #define FILENAME "file"
 #define NLINES 5

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/read/t_file2.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/read/t_file2.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/read/t_file2.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_file2.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $ */
+/* $NetBSD: t_file2.c,v 1.4 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_file2.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $");
+__RCSID("$NetBSD: t_file2.c,v 1.4 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 
@@ -41,7 +41,7 @@ __RCSID("$NetBSD: t_file2.c,v 1.3 2010/1
 
 #include <atf-c.h>
 
-#include "../../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(file2);
 ATF_TC_HEAD(file2, tc)

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/read/t_pipe.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/read/t_pipe.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/read/t_pipe.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pipe.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+/* $NetBSD: t_pipe.c,v 1.2 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_pipe.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+__RCSID("$NetBSD: t_pipe.c,v 1.2 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 
@@ -41,7 +41,7 @@ __RCSID("$NetBSD: t_pipe.c,v 1.1 2009/02
 
 #include <atf-c.h>
 
-#include "../../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(pipe);
 ATF_TC_HEAD(pipe, tc)

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/read/t_ttypty.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/read/t_ttypty.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/read/t_ttypty.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ttypty.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+/* $NetBSD: t_ttypty.c,v 1.2 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ttypty.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+__RCSID("$NetBSD: t_ttypty.c,v 1.2 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 #include <sys/wait.h>
@@ -45,7 +45,7 @@ __RCSID("$NetBSD: t_ttypty.c,v 1.1 2009/
 
 #include <atf-c.h>
 
-#include "../../../h_macros.h"
+#include "h_macros.h"
 
 static void
 h_check(bool check_master)

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/t_ioctl.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/t_ioctl.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/t_ioctl.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ioctl.c,v 1.2 2015/01/14 22:22:32 christos Exp $ */
+/* $NetBSD: t_ioctl.c,v 1.3 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ioctl.c,v 1.2 2015/01/14 22:22:32 christos Exp $");
+__RCSID("$NetBSD: t_ioctl.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 #include <sys/ioctl.h>
@@ -42,7 +42,7 @@ __RCSID("$NetBSD: t_ioctl.c,v 1.2 2015/0
 
 #include <atf-c.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(kfilter_byfilter);
 ATF_TC_HEAD(kfilter_byfilter, tc)

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/t_proc1.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/t_proc1.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/t_proc1.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_proc1.c,v 1.2 2015/01/14 22:22:32 christos Exp $ */
+/* $NetBSD: t_proc1.c,v 1.3 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_proc1.c,v 1.2 2015/01/14 22:22:32 christos Exp $");
+__RCSID("$NetBSD: t_proc1.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
 
 /*
  * this also used to trigger problem fixed in
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: t_proc1.c,v 1.2 2015/0
 
 #include <atf-c.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 static int
 child(void)

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/t_proc2.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/t_proc2.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/t_proc2.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_proc2.c,v 1.2 2015/01/14 22:22:32 christos Exp $ */
+/* $NetBSD: t_proc2.c,v 1.3 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_proc2.c,v 1.2 2015/01/14 22:22:32 christos Exp $");
+__RCSID("$NetBSD: t_proc2.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 #include <sys/time.h>
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: t_proc2.c,v 1.2 2015/0
 
 #include <atf-c.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 static void
 child_two(void)

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/t_proc3.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/t_proc3.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/t_proc3.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_proc3.c,v 1.2 2015/01/14 22:22:32 christos Exp $ */
+/* $NetBSD: t_proc3.c,v 1.3 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_proc3.c,v 1.2 2015/01/14 22:22:32 christos Exp $");
+__RCSID("$NetBSD: t_proc3.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 #include <sys/time.h>
@@ -45,7 +45,7 @@ __RCSID("$NetBSD: t_proc3.c,v 1.2 2015/0
 
 #include <atf-c.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(proc3);
 ATF_TC_HEAD(proc3, tc)

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/t_sig.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/t_sig.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/t_sig.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sig.c,v 1.2 2010/11/03 16:10:20 christos Exp $ */
+/* $NetBSD: t_sig.c,v 1.3 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sig.c,v 1.2 2010/11/03 16:10:20 christos Exp $");
+__RCSID("$NetBSD: t_sig.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 #include <sys/ioctl.h>
@@ -48,7 +48,7 @@ __RCSID("$NetBSD: t_sig.c,v 1.2 2010/11/
 
 #include <atf-c.h>
 
-#include "../../h_macros.h"
+#include "h_macros.h"
 
 #define NSIGNALS 5
 

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/write/t_fifo.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/write/t_fifo.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/write/t_fifo.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fifo.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $ */
+/* $NetBSD: t_fifo.c,v 1.4 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_fifo.c,v 1.3 2010/11/07 17:51:20 jmmv Exp $");
+__RCSID("$NetBSD: t_fifo.c,v 1.4 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 #include <sys/stat.h>
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: t_fifo.c,v 1.3 2010/11
 
 #include <atf-c.h>
 
-#include "../../../h_macros.h"
+#include "h_macros.h"
 
 #define FIFONAME "fifo"
 

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/write/t_pipe.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/write/t_pipe.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/write/t_pipe.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pipe.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+/* $NetBSD: t_pipe.c,v 1.2 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_pipe.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+__RCSID("$NetBSD: t_pipe.c,v 1.2 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 #include <sys/wait.h>
@@ -44,7 +44,7 @@ __RCSID("$NetBSD: t_pipe.c,v 1.1 2009/02
 
 #include <atf-c.h>
 
-#include "../../../h_macros.h"
+#include "h_macros.h"
 
 ATF_TC(pipe1);
 ATF_TC_HEAD(pipe1, tc)

Modified: vendor/NetBSD/tests/dist/kernel/kqueue/write/t_ttypty.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/kqueue/write/t_ttypty.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/kqueue/write/t_ttypty.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ttypty.c,v 1.1 2009/02/20 21:39:58 jmmv Exp $ */
+/* $NetBSD: t_ttypty.c,v 1.2 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ttypty.c,v 1.1 2009/02/20 21:39:58 jmmv Exp $");
+__RCSID("$NetBSD: t_ttypty.c,v 1.2 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/event.h>
 #include <sys/wait.h>
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: t_ttypty.c,v 1.1 2009/
 
 #include <atf-c.h>
 
-#include "../../../h_macros.h"
+#include "h_macros.h"
 
 static void
 h_check(bool check_master)

Modified: vendor/NetBSD/tests/dist/kernel/t_extent.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/t_extent.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/t_extent.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/* $NetBSD: t_extent.c,v 1.4 2012/01/27 18:53:10 para Exp $ */
+/* $NetBSD: t_extent.c,v 1.5 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_extent.c,v 1.4 2012/01/27 18:53:10 para Exp $");
+__RCSID("$NetBSD: t_extent.c,v 1.5 2017/01/13 21:30:41 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
@@ -41,7 +41,7 @@ __RCSID("$NetBSD: t_extent.c,v 1.4 2012/
 
 #include <atf-c.h>
 
-#include "../h_macros.h"
+#include "h_macros.h"
 
 static int ret;
 static struct extent *ex;

Modified: vendor/NetBSD/tests/dist/kernel/t_filedesc.c
==============================================================================
--- vendor/NetBSD/tests/dist/kernel/t_filedesc.c	Sat Jan 14 01:37:03 2017	(r312105)
+++ vendor/NetBSD/tests/dist/kernel/t_filedesc.c	Sat Jan 14 02:26:46 2017	(r312106)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_filedesc.c,v 1.5 2012/03/18 09:46:50 jruoho Exp $	*/
+/*	$NetBSD: t_filedesc.c,v 1.6 2017/01/13 21:30:41 christos Exp $	*/
 
 /*-

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-all mailing list