Module Name: src
Committed By: christos
Date: Fri Jan 13 21:30:43 UTC 2017
Modified Files:
src/tests: Makefile.inc
src/tests/dev/cgd: t_cgd_3des.c t_cgd_aes.c t_cgd_blowfish.c
src/tests/dev/clock_subr: t_clock_subr.c
src/tests/dev/scsipi: t_cd.c
src/tests/dev/sysmon: t_swwdog.c
src/tests/fs/common: h_fsmacros.h
src/tests/fs/ffs: h_quota2_tests.c t_fifos.c t_mount.c t_quota2_1.c
t_quota2_remount.c t_snapshot.c t_snapshot_log.c t_snapshot_v2.c
src/tests/fs/hfs: t_pathconvert.c
src/tests/fs/kernfs: t_basic.c
src/tests/fs/lfs: t_pr.c
src/tests/fs/msdosfs: t_snapshot.c
src/tests/fs/nfs: t_mountd.c
src/tests/fs/nullfs: t_basic.c
src/tests/fs/ptyfs: t_nullpts.c t_ptyfs.c
src/tests/fs/puffs: t_basic.c t_fuzz.c t_io.c
src/tests/fs/tmpfs: t_renamerace.c
src/tests/fs/umapfs: t_basic.c
src/tests/fs/union: t_pr.c
src/tests/fs/vfs: t_full.c t_io.c t_renamerace.c t_ro.c t_union.c
t_unpriv.c t_vfsops.c t_vnops.c
src/tests/include/sys: t_socket.c
src/tests/kernel: t_extent.c t_filedesc.c t_lock.c t_ptrace.c
t_ptrace_wait.c t_pty.c t_rnd.c
src/tests/kernel/arch/amd64: t_ptrace_wait.c
src/tests/kernel/arch/i386: t_ptrace_wait.c
src/tests/kernel/kqueue: t_ioctl.c t_proc1.c t_proc2.c t_proc3.c
t_sig.c
src/tests/kernel/kqueue/read: t_fifo.c t_file.c t_file2.c t_pipe.c
t_ttypty.c
src/tests/kernel/kqueue/write: t_fifo.c t_pipe.c t_ttypty.c
src/tests/lib/libc/gen: t_glob.c
src/tests/lib/libc/sys: t_clock_gettime.c t_pipe.c t_posix_fadvise.c
t_sigaction.c
src/tests/lib/libposix: t_rename.c
src/tests/lib/librefuse: t_refuse_opt.c
src/tests/lib/librumpclient: t_fd.c
src/tests/lib/semaphore: sem.c
src/tests/libexec/ld.elf_so: t_dlerror-cleared.c t_dlerror-false.c
t_dlinfo.c t_ifunc.c
src/tests/modules: t_builtin.c
src/tests/net/bpf: t_bpf.c t_mbuf.c
src/tests/net/bpfilter: t_bpfilter.c
src/tests/net/bpfjit: t_bpfjit.c t_cop.c t_extmem.c t_mbuf.c
src/tests/net/carp: t_basic.c
src/tests/net/config: netconfig.c
src/tests/net/icmp: t_forward.c t_ping.c
src/tests/net/if_loop: t_pr.c
src/tests/net/net: t_raw.c
src/tests/rump/modautoload: t_modautoload.c
src/tests/rump/rumpkern: t_kern.c t_lwproc.c t_modcmd.c t_modlinkset.c
t_signals.c t_threads.c t_tsleep.c t_vm.c
src/tests/rump/rumpvfs: t_basic.c t_etfs.c t_p2kifs.c
Added Files:
src/tests/dev: Makefile.inc
Log Message:
Don't play with "../.." in includes for h_macros.h; deal with it centrally.
Minor fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/Makefile.inc
cvs rdiff -u -r0 -r1.4 src/tests/dev/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/tests/dev/cgd/t_cgd_3des.c \
src/tests/dev/cgd/t_cgd_blowfish.c
cvs rdiff -u -r1.5 -r1.6 src/tests/dev/cgd/t_cgd_aes.c
cvs rdiff -u -r1.2 -r1.3 src/tests/dev/clock_subr/t_clock_subr.c
cvs rdiff -u -r1.7 -r1.8 src/tests/dev/scsipi/t_cd.c
cvs rdiff -u -r1.6 -r1.7 src/tests/dev/sysmon/t_swwdog.c
cvs rdiff -u -r1.40 -r1.41 src/tests/fs/common/h_fsmacros.h
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/ffs/h_quota2_tests.c \
src/tests/fs/ffs/t_quota2_1.c src/tests/fs/ffs/t_quota2_remount.c
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/ffs/t_fifos.c
cvs rdiff -u -r1.13 -r1.14 src/tests/fs/ffs/t_mount.c
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/ffs/t_snapshot.c
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/ffs/t_snapshot_log.c \
src/tests/fs/ffs/t_snapshot_v2.c
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/hfs/t_pathconvert.c
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/kernfs/t_basic.c
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/lfs/t_pr.c
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/msdosfs/t_snapshot.c
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/nfs/t_mountd.c
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/nullfs/t_basic.c
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/ptyfs/t_nullpts.c
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/ptyfs/t_ptyfs.c
cvs rdiff -u -r1.13 -r1.14 src/tests/fs/puffs/t_basic.c
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/puffs/t_fuzz.c
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/puffs/t_io.c
cvs rdiff -u -r1.13 -r1.14 src/tests/fs/tmpfs/t_renamerace.c
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/umapfs/t_basic.c
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/union/t_pr.c
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/vfs/t_full.c src/tests/fs/vfs/t_union.c
cvs rdiff -u -r1.16 -r1.17 src/tests/fs/vfs/t_io.c
cvs rdiff -u -r1.33 -r1.34 src/tests/fs/vfs/t_renamerace.c
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/vfs/t_ro.c
cvs rdiff -u -r1.12 -r1.13 src/tests/fs/vfs/t_unpriv.c
cvs rdiff -u -r1.11 -r1.12 src/tests/fs/vfs/t_vfsops.c
cvs rdiff -u -r1.58 -r1.59 src/tests/fs/vfs/t_vnops.c
cvs rdiff -u -r1.4 -r1.5 src/tests/include/sys/t_socket.c
cvs rdiff -u -r1.4 -r1.5 src/tests/kernel/t_extent.c
cvs rdiff -u -r1.5 -r1.6 src/tests/kernel/t_filedesc.c
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_lock.c src/tests/kernel/t_pty.c
cvs rdiff -u -r1.17 -r1.18 src/tests/kernel/t_ptrace.c
cvs rdiff -u -r1.55 -r1.56 src/tests/kernel/t_ptrace_wait.c
cvs rdiff -u -r1.9 -r1.10 src/tests/kernel/t_rnd.c
cvs rdiff -u -r1.8 -r1.9 src/tests/kernel/arch/amd64/t_ptrace_wait.c
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/arch/i386/t_ptrace_wait.c
cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/kqueue/t_ioctl.c \
src/tests/kernel/kqueue/t_proc1.c src/tests/kernel/kqueue/t_proc2.c \
src/tests/kernel/kqueue/t_proc3.c src/tests/kernel/kqueue/t_sig.c
cvs rdiff -u -r1.3 -r1.4 src/tests/kernel/kqueue/read/t_fifo.c \
src/tests/kernel/kqueue/read/t_file.c \
src/tests/kernel/kqueue/read/t_file2.c
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/kqueue/read/t_pipe.c \
src/tests/kernel/kqueue/read/t_ttypty.c
cvs rdiff -u -r1.3 -r1.4 src/tests/kernel/kqueue/write/t_fifo.c
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/kqueue/write/t_pipe.c \
src/tests/kernel/kqueue/write/t_ttypty.c
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/gen/t_glob.c
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/sys/t_clock_gettime.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sys/t_pipe.c \
src/tests/lib/libc/sys/t_sigaction.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_posix_fadvise.c
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libposix/t_rename.c
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/librefuse/t_refuse_opt.c
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/librumpclient/t_fd.c
cvs rdiff -u -r1.10 -r1.11 src/tests/lib/semaphore/sem.c
cvs rdiff -u -r1.1 -r1.2 src/tests/libexec/ld.elf_so/t_dlerror-cleared.c \
src/tests/libexec/ld.elf_so/t_dlerror-false.c \
src/tests/libexec/ld.elf_so/t_ifunc.c
cvs rdiff -u -r1.4 -r1.5 src/tests/libexec/ld.elf_so/t_dlinfo.c
cvs rdiff -u -r1.2 -r1.3 src/tests/modules/t_builtin.c
cvs rdiff -u -r1.5 -r1.6 src/tests/net/bpf/t_bpf.c
cvs rdiff -u -r1.2 -r1.3 src/tests/net/bpf/t_mbuf.c
cvs rdiff -u -r1.10 -r1.11 src/tests/net/bpfilter/t_bpfilter.c
cvs rdiff -u -r1.11 -r1.12 src/tests/net/bpfjit/t_bpfjit.c
cvs rdiff -u -r1.3 -r1.4 src/tests/net/bpfjit/t_cop.c
cvs rdiff -u -r1.1 -r1.2 src/tests/net/bpfjit/t_extmem.c \
src/tests/net/bpfjit/t_mbuf.c
cvs rdiff -u -r1.5 -r1.6 src/tests/net/carp/t_basic.c
cvs rdiff -u -r1.8 -r1.9 src/tests/net/config/netconfig.c
cvs rdiff -u -r1.9 -r1.10 src/tests/net/icmp/t_forward.c
cvs rdiff -u -r1.16 -r1.17 src/tests/net/icmp/t_ping.c
cvs rdiff -u -r1.7 -r1.8 src/tests/net/if_loop/t_pr.c
cvs rdiff -u -r1.1 -r1.2 src/tests/net/net/t_raw.c
cvs rdiff -u -r1.5 -r1.6 src/tests/rump/modautoload/t_modautoload.c
cvs rdiff -u -r1.3 -r1.4 src/tests/rump/rumpkern/t_kern.c \
src/tests/rump/rumpkern/t_vm.c
cvs rdiff -u -r1.8 -r1.9 src/tests/rump/rumpkern/t_lwproc.c
cvs rdiff -u -r1.9 -r1.10 src/tests/rump/rumpkern/t_modcmd.c
cvs rdiff -u -r1.2 -r1.3 src/tests/rump/rumpkern/t_modlinkset.c \
src/tests/rump/rumpkern/t_signals.c
cvs rdiff -u -r1.1 -r1.2 src/tests/rump/rumpkern/t_threads.c \
src/tests/rump/rumpkern/t_tsleep.c
cvs rdiff -u -r1.2 -r1.3 src/tests/rump/rumpvfs/t_basic.c
cvs rdiff -u -r1.10 -r1.11 src/tests/rump/rumpvfs/t_etfs.c
cvs rdiff -u -r1.5 -r1.6 src/tests/rump/rumpvfs/t_p2kifs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/Makefile.inc
diff -u src/tests/Makefile.inc:1.2 src/tests/Makefile.inc:1.3
--- src/tests/Makefile.inc:1.2 Fri Sep 16 12:30:18 2011
+++ src/tests/Makefile.inc Fri Jan 13 16:30:39 2017
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/09/16 16:30:18 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2017/01/13 21:30:39 christos Exp $
WARNS ?= 4
CWARNFLAGS+= -Wno-missing-noreturn
+CPPFLAGS:= ${CPPFLAGS} -I${.PARSEDIR}
Index: src/tests/dev/cgd/t_cgd_3des.c
diff -u src/tests/dev/cgd/t_cgd_3des.c:1.1 src/tests/dev/cgd/t_cgd_3des.c:1.2
--- src/tests/dev/cgd/t_cgd_3des.c:1.1 Fri Nov 11 02:39:58 2016
+++ src/tests/dev/cgd/t_cgd_3des.c Fri Jan 13 16:30:39 2017
@@ -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
Index: src/tests/dev/cgd/t_cgd_blowfish.c
diff -u src/tests/dev/cgd/t_cgd_blowfish.c:1.1 src/tests/dev/cgd/t_cgd_blowfish.c:1.2
--- src/tests/dev/cgd/t_cgd_blowfish.c:1.1 Thu Nov 10 18:44:36 2016
+++ src/tests/dev/cgd/t_cgd_blowfish.c Fri Jan 13 16:30:39 2017
@@ -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
Index: src/tests/dev/cgd/t_cgd_aes.c
diff -u src/tests/dev/cgd/t_cgd_aes.c:1.5 src/tests/dev/cgd/t_cgd_aes.c:1.6
--- src/tests/dev/cgd/t_cgd_aes.c:1.5 Sat Dec 10 19:23:44 2016
+++ src/tests/dev/cgd/t_cgd_aes.c Fri Jan 13 16:30:39 2017
@@ -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
Index: src/tests/dev/clock_subr/t_clock_subr.c
diff -u src/tests/dev/clock_subr/t_clock_subr.c:1.2 src/tests/dev/clock_subr/t_clock_subr.c:1.3
--- src/tests/dev/clock_subr/t_clock_subr.c:1.2 Wed Aug 17 08:06:49 2016
+++ src/tests/dev/clock_subr/t_clock_subr.c Fri Jan 13 16:30:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_clock_subr.c,v 1.2 2016/08/17 12:06:49 jakllsch Exp $ */
+/* $NetBSD: t_clock_subr.c,v 1.3 2017/01/13 21:30:39 christos Exp $ */
/*
* Copyright (c) 2016 Jonathan A. Kollasch
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2016\
Jonathan A. Kollasch. All rights reserved.");
-__RCSID("$NetBSD: t_clock_subr.c,v 1.2 2016/08/17 12:06:49 jakllsch Exp $");
+__RCSID("$NetBSD: t_clock_subr.c,v 1.3 2017/01/13 21:30:39 christos Exp $");
#include <sys/types.h>
#include <dev/clock_subr.h>
@@ -40,16 +40,16 @@ __RCSID("$NetBSD: t_clock_subr.c,v 1.2 2
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
#define FILL(ti,ye,mo,da,wd,ho,mi,se) \
{ .time = (ti), .clock = { .dt_year = (ye), .dt_mon = (mo), .dt_day = (da), \
.dt_wday = (wd), .dt_hour = (ho), .dt_min = (mi), .dt_sec = (se), } }
-struct clock_test {
+static struct clock_test {
time_t time;
struct clock_ymdhms clock;
-} static const clock_tests[] = {
+} const clock_tests[] = {
FILL( 0,1970, 1, 1,4, 0, 0, 0), // Thu Jan 1 00:00:00 UTC 1970
FILL( 15638400,1970, 7, 1,3, 0, 0, 0), // Wed Jul 1 00:00:00 UTC 1970
FILL( 31536000,1971, 1, 1,5, 0, 0, 0), // Fri Jan 1 00:00:00 UTC 1971
Index: src/tests/dev/scsipi/t_cd.c
diff -u src/tests/dev/scsipi/t_cd.c:1.7 src/tests/dev/scsipi/t_cd.c:1.8
--- src/tests/dev/scsipi/t_cd.c:1.7 Thu Apr 24 20:24:39 2014
+++ src/tests/dev/scsipi/t_cd.c Fri Jan 13 16:30:39 2017
@@ -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)
Index: src/tests/dev/sysmon/t_swwdog.c
diff -u src/tests/dev/sysmon/t_swwdog.c:1.6 src/tests/dev/sysmon/t_swwdog.c:1.7
--- src/tests/dev/sysmon/t_swwdog.c:1.6 Thu Apr 23 00:49:37 2015
+++ src/tests/dev/sysmon/t_swwdog.c Fri Jan 13 16:30:39 2017
@@ -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;
Index: src/tests/fs/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.40 src/tests/fs/common/h_fsmacros.h:1.41
--- src/tests/fs/common/h_fsmacros.h:1.40 Sat Aug 29 15:19:43 2015
+++ src/tests/fs/common/h_fsmacros.h Fri Jan 13 16:30:39 2017
@@ -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 *, \
Index: src/tests/fs/ffs/h_quota2_tests.c
diff -u src/tests/fs/ffs/h_quota2_tests.c:1.4 src/tests/fs/ffs/h_quota2_tests.c:1.5
--- src/tests/fs/ffs/h_quota2_tests.c:1.4 Sun Sep 30 17:26:57 2012
+++ src/tests/fs/ffs/h_quota2_tests.c Fri Jan 13 16:30:39 2017
@@ -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;
Index: src/tests/fs/ffs/t_quota2_1.c
diff -u src/tests/fs/ffs/t_quota2_1.c:1.4 src/tests/fs/ffs/t_quota2_1.c:1.5
--- src/tests/fs/ffs/t_quota2_1.c:1.4 Wed Mar 14 22:02:22 2012
+++ src/tests/fs/ffs/t_quota2_1.c Fri Jan 13 16:30:39 2017
@@ -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)
Index: src/tests/fs/ffs/t_quota2_remount.c
diff -u src/tests/fs/ffs/t_quota2_remount.c:1.4 src/tests/fs/ffs/t_quota2_remount.c:1.5
--- src/tests/fs/ffs/t_quota2_remount.c:1.4 Wed Mar 14 22:02:22 2012
+++ src/tests/fs/ffs/t_quota2_remount.c Fri Jan 13 16:30:39 2017
@@ -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)
Index: src/tests/fs/ffs/t_fifos.c
diff -u src/tests/fs/ffs/t_fifos.c:1.5 src/tests/fs/ffs/t_fifos.c:1.6
--- src/tests/fs/ffs/t_fifos.c:1.5 Sun Nov 7 12:51:17 2010
+++ src/tests/fs/ffs/t_fifos.c Fri Jan 13 16:30:39 2017
@@ -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)
Index: src/tests/fs/ffs/t_mount.c
diff -u src/tests/fs/ffs/t_mount.c:1.13 src/tests/fs/ffs/t_mount.c:1.14
--- src/tests/fs/ffs/t_mount.c:1.13 Tue Nov 27 11:01:49 2012
+++ src/tests/fs/ffs/t_mount.c Fri Jan 13 16:30:39 2017
@@ -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)
Index: src/tests/fs/ffs/t_snapshot.c
diff -u src/tests/fs/ffs/t_snapshot.c:1.6 src/tests/fs/ffs/t_snapshot.c:1.7
--- src/tests/fs/ffs/t_snapshot.c:1.6 Wed Feb 6 04:05:01 2013
+++ src/tests/fs/ffs/t_snapshot.c Fri Jan 13 16:30:39 2017
@@ -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
Index: src/tests/fs/ffs/t_snapshot_log.c
diff -u src/tests/fs/ffs/t_snapshot_log.c:1.2 src/tests/fs/ffs/t_snapshot_log.c:1.3
--- src/tests/fs/ffs/t_snapshot_log.c:1.2 Wed Feb 6 04:05:01 2013
+++ src/tests/fs/ffs/t_snapshot_log.c Fri Jan 13 16:30:39 2017
@@ -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
Index: src/tests/fs/ffs/t_snapshot_v2.c
diff -u src/tests/fs/ffs/t_snapshot_v2.c:1.2 src/tests/fs/ffs/t_snapshot_v2.c:1.3
--- src/tests/fs/ffs/t_snapshot_v2.c:1.2 Wed Feb 6 04:05:01 2013
+++ src/tests/fs/ffs/t_snapshot_v2.c Fri Jan 13 16:30:39 2017
@@ -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
Index: src/tests/fs/hfs/t_pathconvert.c
diff -u src/tests/fs/hfs/t_pathconvert.c:1.5 src/tests/fs/hfs/t_pathconvert.c:1.6
--- src/tests/fs/hfs/t_pathconvert.c:1.5 Fri Feb 25 15:54:18 2011
+++ src/tests/fs/hfs/t_pathconvert.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/kernfs/t_basic.c
diff -u src/tests/fs/kernfs/t_basic.c:1.3 src/tests/fs/kernfs/t_basic.c:1.4
--- src/tests/fs/kernfs/t_basic.c:1.3 Mon May 31 19:44:54 2010
+++ src/tests/fs/kernfs/t_basic.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/lfs/t_pr.c
diff -u src/tests/fs/lfs/t_pr.c:1.6 src/tests/fs/lfs/t_pr.c:1.7
--- src/tests/fs/lfs/t_pr.c:1.6 Tue Feb 22 13:41:05 2011
+++ src/tests/fs/lfs/t_pr.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/msdosfs/t_snapshot.c
diff -u src/tests/fs/msdosfs/t_snapshot.c:1.3 src/tests/fs/msdosfs/t_snapshot.c:1.4
--- src/tests/fs/msdosfs/t_snapshot.c:1.3 Tue Jun 10 09:15:18 2014
+++ src/tests/fs/msdosfs/t_snapshot.c Fri Jan 13 16:30:40 2017
@@ -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
Index: src/tests/fs/nfs/t_mountd.c
diff -u src/tests/fs/nfs/t_mountd.c:1.5 src/tests/fs/nfs/t_mountd.c:1.6
--- src/tests/fs/nfs/t_mountd.c:1.5 Fri Feb 24 08:53:46 2012
+++ src/tests/fs/nfs/t_mountd.c Fri Jan 13 16:30:40 2017
@@ -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);
Index: src/tests/fs/nullfs/t_basic.c
diff -u src/tests/fs/nullfs/t_basic.c:1.3 src/tests/fs/nullfs/t_basic.c:1.4
--- src/tests/fs/nullfs/t_basic.c:1.3 Wed Jun 9 04:37:16 2010
+++ src/tests/fs/nullfs/t_basic.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/ptyfs/t_nullpts.c
diff -u src/tests/fs/ptyfs/t_nullpts.c:1.5 src/tests/fs/ptyfs/t_nullpts.c:1.6
--- src/tests/fs/ptyfs/t_nullpts.c:1.5 Mon Jan 10 06:11:04 2011
+++ src/tests/fs/ptyfs/t_nullpts.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/ptyfs/t_ptyfs.c
diff -u src/tests/fs/ptyfs/t_ptyfs.c:1.1 src/tests/fs/ptyfs/t_ptyfs.c:1.2
--- src/tests/fs/ptyfs/t_ptyfs.c:1.1 Fri Jun 11 19:52:38 2010
+++ src/tests/fs/ptyfs/t_ptyfs.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/puffs/t_basic.c
diff -u src/tests/fs/puffs/t_basic.c:1.13 src/tests/fs/puffs/t_basic.c:1.14
--- src/tests/fs/puffs/t_basic.c:1.13 Thu Dec 1 09:49:04 2016
+++ src/tests/fs/puffs/t_basic.c Fri Jan 13 16:30:40 2017
@@ -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"
/*
Index: src/tests/fs/puffs/t_fuzz.c
diff -u src/tests/fs/puffs/t_fuzz.c:1.5 src/tests/fs/puffs/t_fuzz.c:1.6
--- src/tests/fs/puffs/t_fuzz.c:1.5 Fri Apr 20 21:03:46 2012
+++ src/tests/fs/puffs/t_fuzz.c Fri Jan 13 16:30:40 2017
@@ -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
Index: src/tests/fs/puffs/t_io.c
diff -u src/tests/fs/puffs/t_io.c:1.1 src/tests/fs/puffs/t_io.c:1.2
--- src/tests/fs/puffs/t_io.c:1.1 Fri Nov 12 12:33:28 2010
+++ src/tests/fs/puffs/t_io.c Fri Jan 13 16:30:40 2017
@@ -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(...) \
Index: src/tests/fs/tmpfs/t_renamerace.c
diff -u src/tests/fs/tmpfs/t_renamerace.c:1.13 src/tests/fs/tmpfs/t_renamerace.c:1.14
--- src/tests/fs/tmpfs/t_renamerace.c:1.13 Thu Aug 18 17:44:55 2011
+++ src/tests/fs/tmpfs/t_renamerace.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/umapfs/t_basic.c
diff -u src/tests/fs/umapfs/t_basic.c:1.4 src/tests/fs/umapfs/t_basic.c:1.5
--- src/tests/fs/umapfs/t_basic.c:1.4 Mon Jul 19 11:35:39 2010
+++ src/tests/fs/umapfs/t_basic.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/union/t_pr.c
diff -u src/tests/fs/union/t_pr.c:1.8 src/tests/fs/union/t_pr.c:1.9
--- src/tests/fs/union/t_pr.c:1.8 Wed Aug 10 02:27:02 2011
+++ src/tests/fs/union/t_pr.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/vfs/t_full.c
diff -u src/tests/fs/vfs/t_full.c:1.8 src/tests/fs/vfs/t_full.c:1.9
--- src/tests/fs/vfs/t_full.c:1.8 Sat Mar 16 01:45:37 2013
+++ src/tests/fs/vfs/t_full.c Fri Jan 13 16:30:40 2017
@@ -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,
Index: src/tests/fs/vfs/t_union.c
diff -u src/tests/fs/vfs/t_union.c:1.8 src/tests/fs/vfs/t_union.c:1.9
--- src/tests/fs/vfs/t_union.c:1.8 Sun Aug 7 02:01:51 2011
+++ src/tests/fs/vfs/t_union.c Fri Jan 13 16:30:40 2017
@@ -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"
Index: src/tests/fs/vfs/t_io.c
diff -u src/tests/fs/vfs/t_io.c:1.16 src/tests/fs/vfs/t_io.c:1.17
--- src/tests/fs/vfs/t_io.c:1.16 Sat Apr 4 08:34:44 2015
+++ src/tests/fs/vfs/t_io.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/vfs/t_renamerace.c
diff -u src/tests/fs/vfs/t_renamerace.c:1.33 src/tests/fs/vfs/t_renamerace.c:1.34
--- src/tests/fs/vfs/t_renamerace.c:1.33 Wed May 4 04:30:22 2016
+++ src/tests/fs/vfs/t_renamerace.c Fri Jan 13 16:30:40 2017
@@ -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;
Index: src/tests/fs/vfs/t_ro.c
diff -u src/tests/fs/vfs/t_ro.c:1.5 src/tests/fs/vfs/t_ro.c:1.6
--- src/tests/fs/vfs/t_ro.c:1.5 Tue Feb 22 16:23:19 2011
+++ src/tests/fs/vfs/t_ro.c Fri Jan 13 16:30:40 2017
@@ -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"
Index: src/tests/fs/vfs/t_unpriv.c
diff -u src/tests/fs/vfs/t_unpriv.c:1.12 src/tests/fs/vfs/t_unpriv.c:1.13
--- src/tests/fs/vfs/t_unpriv.c:1.12 Thu Apr 9 15:51:13 2015
+++ src/tests/fs/vfs/t_unpriv.c Fri Jan 13 16:30:40 2017
@@ -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)) \
Index: src/tests/fs/vfs/t_vfsops.c
diff -u src/tests/fs/vfs/t_vfsops.c:1.11 src/tests/fs/vfs/t_vfsops.c:1.12
--- src/tests/fs/vfs/t_vfsops.c:1.11 Mon Apr 4 15:16:58 2011
+++ src/tests/fs/vfs/t_vfsops.c Fri Jan 13 16:30:40 2017
@@ -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)
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.58 src/tests/fs/vfs/t_vnops.c:1.59
--- src/tests/fs/vfs/t_vnops.c:1.58 Sun Aug 28 22:31:46 2016
+++ src/tests/fs/vfs/t_vnops.c Fri Jan 13 16:30:40 2017
@@ -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"
Index: src/tests/include/sys/t_socket.c
diff -u src/tests/include/sys/t_socket.c:1.4 src/tests/include/sys/t_socket.c:1.5
--- src/tests/include/sys/t_socket.c:1.4 Fri Feb 27 03:30:30 2015
+++ src/tests/include/sys/t_socket.c Fri Jan 13 16:30:41 2017
@@ -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)
Index: src/tests/kernel/t_extent.c
diff -u src/tests/kernel/t_extent.c:1.4 src/tests/kernel/t_extent.c:1.5
--- src/tests/kernel/t_extent.c:1.4 Fri Jan 27 13:53:10 2012
+++ src/tests/kernel/t_extent.c Fri Jan 13 16:30:41 2017
@@ -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;
Index: src/tests/kernel/t_filedesc.c
diff -u src/tests/kernel/t_filedesc.c:1.5 src/tests/kernel/t_filedesc.c:1.6
--- src/tests/kernel/t_filedesc.c:1.5 Sun Mar 18 05:46:50 2012
+++ src/tests/kernel/t_filedesc.c Fri Jan 13 16:30:41 2017
@@ -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 $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_filedesc.c,v 1.5 2012/03/18 09:46:50 jruoho Exp $");
+__RCSID("$NetBSD: t_filedesc.c,v 1.6 2017/01/13 21:30:41 christos Exp $");
#include <sys/types.h>
@@ -40,7 +40,7 @@ __RCSID("$NetBSD: t_filedesc.c,v 1.5 201
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
-#include "../h_macros.h"
+#include "h_macros.h"
ATF_TC(getfilerace);
ATF_TC_HEAD(getfilerace, tc)
Index: src/tests/kernel/t_lock.c
diff -u src/tests/kernel/t_lock.c:1.1 src/tests/kernel/t_lock.c:1.2
--- src/tests/kernel/t_lock.c:1.1 Fri Feb 20 16:39:57 2009
+++ src/tests/kernel/t_lock.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_lock.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $ */
+/* $NetBSD: t_lock.c,v 1.2 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2002, 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_lock.c,v 1.1 2009/02/20 21:39:57 jmmv Exp $");
+__RCSID("$NetBSD: t_lock.c,v 1.2 2017/01/13 21:30:41 christos Exp $");
#include <sys/time.h>
@@ -38,7 +38,7 @@ __RCSID("$NetBSD: t_lock.c,v 1.1 2009/02
#include <atf-c.h>
-#include "../h_macros.h"
+#include "h_macros.h"
__cpu_simple_lock_t lk;
volatile int handled = 0;
Index: src/tests/kernel/t_pty.c
diff -u src/tests/kernel/t_pty.c:1.1 src/tests/kernel/t_pty.c:1.2
--- src/tests/kernel/t_pty.c:1.1 Sat Sep 24 11:53:01 2011
+++ src/tests/kernel/t_pty.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $Id: t_pty.c,v 1.1 2011/09/24 15:53:01 christos Exp $ */
+/* $Id: t_pty.c,v 1.2 2017/01/13 21:30:41 christos Exp $ */
/*
* Allocates a pty(4) device, and sends the specified number of packets of the
@@ -9,7 +9,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_pty.c,v 1.1 2011/09/24 15:53:01 christos Exp $");
+__RCSID("$NetBSD: t_pty.c,v 1.2 2017/01/13 21:30:41 christos Exp $");
#include <errno.h>
#include <err.h>
@@ -35,7 +35,7 @@ static __dead void usage(const char *);
static void parse_args(int, char **);
#else
#include <atf-c.h>
-#include "../h_macros.h"
+#include "h_macros.h"
#endif
static int pty_open(void);
Index: src/tests/kernel/t_ptrace.c
diff -u src/tests/kernel/t_ptrace.c:1.17 src/tests/kernel/t_ptrace.c:1.18
--- src/tests/kernel/t_ptrace.c:1.17 Sun Nov 13 17:59:31 2016
+++ src/tests/kernel/t_ptrace.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace.c,v 1.17 2016/11/13 22:59:31 kamil Exp $ */
+/* $NetBSD: t_ptrace.c,v 1.18 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace.c,v 1.17 2016/11/13 22:59:31 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace.c,v 1.18 2017/01/13 21:30:41 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -40,7 +40,7 @@ __RCSID("$NetBSD: t_ptrace.c,v 1.17 2016
#include <atf-c.h>
-#include "../h_macros.h"
+#include "h_macros.h"
/*
* A child process cannot call atf functions and expect them to magically
Index: src/tests/kernel/t_ptrace_wait.c
diff -u src/tests/kernel/t_ptrace_wait.c:1.55 src/tests/kernel/t_ptrace_wait.c:1.56
--- src/tests/kernel/t_ptrace_wait.c:1.55 Thu Jan 12 22:01:09 2017
+++ src/tests/kernel/t_ptrace_wait.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.55 2017/01/13 03:01:09 kre Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.56 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.55 2017/01/13 03:01:09 kre Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.56 2017/01/13 21:30:41 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -48,7 +48,7 @@ __RCSID("$NetBSD: t_ptrace_wait.c,v 1.55
#include <atf-c.h>
-#include "../h_macros.h"
+#include "h_macros.h"
#include "t_ptrace_wait.h"
#include "msg.h"
Index: src/tests/kernel/t_rnd.c
diff -u src/tests/kernel/t_rnd.c:1.9 src/tests/kernel/t_rnd.c:1.10
--- src/tests/kernel/t_rnd.c:1.9 Sun May 22 00:34:44 2016
+++ src/tests/kernel/t_rnd.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_rnd.c,v 1.9 2016/05/22 04:34:44 riastradh Exp $ */
+/* $NetBSD: t_rnd.c,v 1.10 2017/01/13 21:30:41 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_rnd.c,v 1.9 2016/05/22 04:34:44 riastradh Exp $");
+__RCSID("$NetBSD: t_rnd.c,v 1.10 2017/01/13 21:30:41 christos Exp $");
#include <sys/types.h>
#include <sys/fcntl.h>
@@ -39,7 +39,7 @@ __RCSID("$NetBSD: t_rnd.c,v 1.9 2016/05/
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
-#include "../h_macros.h"
+#include "h_macros.h"
ATF_TC(RNDADDDATA);
ATF_TC_HEAD(RNDADDDATA, tc)
Index: src/tests/kernel/arch/amd64/t_ptrace_wait.c
diff -u src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.8 src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.9
--- src/tests/kernel/arch/amd64/t_ptrace_wait.c:1.8 Thu Dec 15 07:15:20 2016
+++ src/tests/kernel/arch/amd64/t_ptrace_wait.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.8 2016/12/15 12:15:20 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.9 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.8 2016/12/15 12:15:20 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.9 2017/01/13 21:30:41 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -50,7 +50,7 @@ __RCSID("$NetBSD: t_ptrace_wait.c,v 1.8
#include <atf-c.h>
-#include "../../../h_macros.h"
+#include "h_macros.h"
#include "../../t_ptrace_wait.h"
Index: src/tests/kernel/arch/i386/t_ptrace_wait.c
diff -u src/tests/kernel/arch/i386/t_ptrace_wait.c:1.1 src/tests/kernel/arch/i386/t_ptrace_wait.c:1.2
--- src/tests/kernel/arch/i386/t_ptrace_wait.c:1.1 Tue Dec 13 13:00:10 2016
+++ src/tests/kernel/arch/i386/t_ptrace_wait.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.1 2016/12/13 18:00:10 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.2 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.1 2016/12/13 18:00:10 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.2 2017/01/13 21:30:41 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -49,7 +49,7 @@ __RCSID("$NetBSD: t_ptrace_wait.c,v 1.1
#include <atf-c.h>
-#include "../../../h_macros.h"
+#include "h_macros.h"
#include "../../t_ptrace_wait.h"
Index: src/tests/kernel/kqueue/t_ioctl.c
diff -u src/tests/kernel/kqueue/t_ioctl.c:1.2 src/tests/kernel/kqueue/t_ioctl.c:1.3
--- src/tests/kernel/kqueue/t_ioctl.c:1.2 Wed Jan 14 17:22:32 2015
+++ src/tests/kernel/kqueue/t_ioctl.c Fri Jan 13 16:30:41 2017
@@ -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)
Index: src/tests/kernel/kqueue/t_proc1.c
diff -u src/tests/kernel/kqueue/t_proc1.c:1.2 src/tests/kernel/kqueue/t_proc1.c:1.3
--- src/tests/kernel/kqueue/t_proc1.c:1.2 Wed Jan 14 17:22:32 2015
+++ src/tests/kernel/kqueue/t_proc1.c Fri Jan 13 16:30:41 2017
@@ -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)
Index: src/tests/kernel/kqueue/t_proc2.c
diff -u src/tests/kernel/kqueue/t_proc2.c:1.2 src/tests/kernel/kqueue/t_proc2.c:1.3
--- src/tests/kernel/kqueue/t_proc2.c:1.2 Wed Jan 14 17:22:32 2015
+++ src/tests/kernel/kqueue/t_proc2.c Fri Jan 13 16:30:41 2017
@@ -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)
Index: src/tests/kernel/kqueue/t_proc3.c
diff -u src/tests/kernel/kqueue/t_proc3.c:1.2 src/tests/kernel/kqueue/t_proc3.c:1.3
--- src/tests/kernel/kqueue/t_proc3.c:1.2 Wed Jan 14 17:22:32 2015
+++ src/tests/kernel/kqueue/t_proc3.c Fri Jan 13 16:30:41 2017
@@ -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)
Index: src/tests/kernel/kqueue/t_sig.c
diff -u src/tests/kernel/kqueue/t_sig.c:1.2 src/tests/kernel/kqueue/t_sig.c:1.3
--- src/tests/kernel/kqueue/t_sig.c:1.2 Wed Nov 3 12:10:20 2010
+++ src/tests/kernel/kqueue/t_sig.c Fri Jan 13 16:30:41 2017
@@ -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
Index: src/tests/kernel/kqueue/read/t_fifo.c
diff -u src/tests/kernel/kqueue/read/t_fifo.c:1.3 src/tests/kernel/kqueue/read/t_fifo.c:1.4
--- src/tests/kernel/kqueue/read/t_fifo.c:1.3 Sun Nov 7 12:51:20 2010
+++ src/tests/kernel/kqueue/read/t_fifo.c Fri Jan 13 16:30:41 2017
@@ -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"
Index: src/tests/kernel/kqueue/read/t_file.c
diff -u src/tests/kernel/kqueue/read/t_file.c:1.3 src/tests/kernel/kqueue/read/t_file.c:1.4
--- src/tests/kernel/kqueue/read/t_file.c:1.3 Sun Nov 7 12:51:20 2010
+++ src/tests/kernel/kqueue/read/t_file.c Fri Jan 13 16:30:41 2017
@@ -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
Index: src/tests/kernel/kqueue/read/t_file2.c
diff -u src/tests/kernel/kqueue/read/t_file2.c:1.3 src/tests/kernel/kqueue/read/t_file2.c:1.4
--- src/tests/kernel/kqueue/read/t_file2.c:1.3 Sun Nov 7 12:51:20 2010
+++ src/tests/kernel/kqueue/read/t_file2.c Fri Jan 13 16:30:41 2017
@@ -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)
Index: src/tests/kernel/kqueue/read/t_pipe.c
diff -u src/tests/kernel/kqueue/read/t_pipe.c:1.1 src/tests/kernel/kqueue/read/t_pipe.c:1.2
--- src/tests/kernel/kqueue/read/t_pipe.c:1.1 Fri Feb 20 16:39:57 2009
+++ src/tests/kernel/kqueue/read/t_pipe.c Fri Jan 13 16:30:41 2017
@@ -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)
Index: src/tests/kernel/kqueue/read/t_ttypty.c
diff -u src/tests/kernel/kqueue/read/t_ttypty.c:1.1 src/tests/kernel/kqueue/read/t_ttypty.c:1.2
--- src/tests/kernel/kqueue/read/t_ttypty.c:1.1 Fri Feb 20 16:39:57 2009
+++ src/tests/kernel/kqueue/read/t_ttypty.c Fri Jan 13 16:30:41 2017
@@ -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)
Index: src/tests/kernel/kqueue/write/t_fifo.c
diff -u src/tests/kernel/kqueue/write/t_fifo.c:1.3 src/tests/kernel/kqueue/write/t_fifo.c:1.4
--- src/tests/kernel/kqueue/write/t_fifo.c:1.3 Sun Nov 7 12:51:20 2010
+++ src/tests/kernel/kqueue/write/t_fifo.c Fri Jan 13 16:30:41 2017
@@ -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"
Index: src/tests/kernel/kqueue/write/t_pipe.c
diff -u src/tests/kernel/kqueue/write/t_pipe.c:1.1 src/tests/kernel/kqueue/write/t_pipe.c:1.2
--- src/tests/kernel/kqueue/write/t_pipe.c:1.1 Fri Feb 20 16:39:57 2009
+++ src/tests/kernel/kqueue/write/t_pipe.c Fri Jan 13 16:30:41 2017
@@ -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)
Index: src/tests/kernel/kqueue/write/t_ttypty.c
diff -u src/tests/kernel/kqueue/write/t_ttypty.c:1.1 src/tests/kernel/kqueue/write/t_ttypty.c:1.2
--- src/tests/kernel/kqueue/write/t_ttypty.c:1.1 Fri Feb 20 16:39:58 2009
+++ src/tests/kernel/kqueue/write/t_ttypty.c Fri Jan 13 16:30:41 2017
@@ -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)
Index: src/tests/lib/libc/gen/t_glob.c
diff -u src/tests/lib/libc/gen/t_glob.c:1.3 src/tests/lib/libc/gen/t_glob.c:1.4
--- src/tests/lib/libc/gen/t_glob.c:1.3 Wed Jan 2 06:28:48 2013
+++ src/tests/lib/libc/gen/t_glob.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_glob.c,v 1.3 2013/01/02 11:28:48 martin Exp $ */
+/* $NetBSD: t_glob.c,v 1.4 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_glob.c,v 1.3 2013/01/02 11:28:48 martin Exp $");
+__RCSID("$NetBSD: t_glob.c,v 1.4 2017/01/13 21:30:41 christos Exp $");
#include <atf-c.h>
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: t_glob.c,v 1.3 2013/01
#include <string.h>
#include <errno.h>
-#include "../../../h_macros.h"
+#include "h_macros.h"
#ifdef DEBUG
Index: src/tests/lib/libc/sys/t_clock_gettime.c
diff -u src/tests/lib/libc/sys/t_clock_gettime.c:1.2 src/tests/lib/libc/sys/t_clock_gettime.c:1.3
--- src/tests/lib/libc/sys/t_clock_gettime.c:1.2 Fri Jan 13 15:10:57 2017
+++ src/tests/lib/libc/sys/t_clock_gettime.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_clock_gettime.c,v 1.2 2017/01/13 20:10:57 christos Exp $ */
+/* $NetBSD: t_clock_gettime.c,v 1.3 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_clock_gettime.c,v 1.2 2017/01/13 20:10:57 christos Exp $");
+__RCSID("$NetBSD: t_clock_gettime.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -74,7 +74,7 @@ __RCSID("$NetBSD: t_clock_gettime.c,v 1.
#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: src/tests/lib/libc/sys/t_pipe.c
diff -u src/tests/lib/libc/sys/t_pipe.c:1.4 src/tests/lib/libc/sys/t_pipe.c:1.5
--- src/tests/lib/libc/sys/t_pipe.c:1.4 Fri Jan 13 15:46:15 2017
+++ src/tests/lib/libc/sys/t_pipe.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pipe.c,v 1.4 2017/01/13 20:46:15 christos Exp $ */
+/* $NetBSD: t_pipe.c,v 1.5 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2001, 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_pipe.c,v 1.4 2017/01/13 20:46:15 christos Exp $");
+__RCSID("$NetBSD: t_pipe.c,v 1.5 2017/01/13 21:30:41 christos Exp $");
#include <sys/types.h>
#include <sys/wait.h>
@@ -45,7 +45,7 @@ __RCSID("$NetBSD: t_pipe.c,v 1.4 2017/01
#include <atf-c.h>
-#include "../../../h_macros.h"
+#include "h_macros.h"
static pid_t pid;
static int nsiginfo = 0;
Index: src/tests/lib/libc/sys/t_sigaction.c
diff -u src/tests/lib/libc/sys/t_sigaction.c:1.4 src/tests/lib/libc/sys/t_sigaction.c:1.5
--- src/tests/lib/libc/sys/t_sigaction.c:1.4 Fri Jan 13 15:08:38 2017
+++ src/tests/lib/libc/sys/t_sigaction.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sigaction.c,v 1.4 2017/01/13 20:08:38 christos Exp $ */
+/* $NetBSD: t_sigaction.c,v 1.5 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2010\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sigaction.c,v 1.4 2017/01/13 20:08:38 christos Exp $");
+__RCSID("$NetBSD: t_sigaction.c,v 1.5 2017/01/13 21:30:41 christos Exp $");
#include <sys/wait.h>
@@ -41,7 +41,7 @@ __RCSID("$NetBSD: t_sigaction.c,v 1.4 20
#include <atf-c.h>
-#include "../../../h_macros.h"
+#include "h_macros.h"
static bool handler_called = false;
Index: src/tests/lib/libc/sys/t_posix_fadvise.c
diff -u src/tests/lib/libc/sys/t_posix_fadvise.c:1.1 src/tests/lib/libc/sys/t_posix_fadvise.c:1.2
--- src/tests/lib/libc/sys/t_posix_fadvise.c:1.1 Sat Oct 15 02:10:26 2011
+++ src/tests/lib/libc/sys/t_posix_fadvise.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_posix_fadvise.c,v 1.1 2011/10/15 06:10:26 jruoho Exp $ */
+/* $NetBSD: t_posix_fadvise.c,v 1.2 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_posix_fadvise.c,v 1.1 2011/10/15 06:10:26 jruoho Exp $");
+__RCSID("$NetBSD: t_posix_fadvise.c,v 1.2 2017/01/13 21:30:41 christos Exp $");
#include <sys/fcntl.h>
@@ -68,7 +68,7 @@ __RCSID("$NetBSD: t_posix_fadvise.c,v 1.
#include <atf-c.h>
-#include "../../../h_macros.h"
+#include "h_macros.h"
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
Index: src/tests/lib/libposix/t_rename.c
diff -u src/tests/lib/libposix/t_rename.c:1.2 src/tests/lib/libposix/t_rename.c:1.3
--- src/tests/lib/libposix/t_rename.c:1.2 Sun May 15 20:03:36 2011
+++ src/tests/lib/libposix/t_rename.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_rename.c,v 1.2 2011/05/16 00:03:36 christos Exp $ */
+/* $NetBSD: t_rename.c,v 1.3 2017/01/13 21:30:41 christos Exp $ */
/*
* Copyright (c) 2001, 2008, 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_rename.c,v 1.2 2011/05/16 00:03:36 christos Exp $");
+__RCSID("$NetBSD: t_rename.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -43,7 +43,7 @@ __RCSID("$NetBSD: t_rename.c,v 1.2 2011/
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(rename);
ATF_TC_HEAD(rename, tc)
Index: src/tests/lib/librefuse/t_refuse_opt.c
diff -u src/tests/lib/librefuse/t_refuse_opt.c:1.7 src/tests/lib/librefuse/t_refuse_opt.c:1.8
--- src/tests/lib/librefuse/t_refuse_opt.c:1.7 Mon Nov 21 11:26:16 2016
+++ src/tests/lib/librefuse/t_refuse_opt.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_refuse_opt.c,v 1.7 2016/11/21 16:26:16 christos Exp $ */
+/* $NetBSD: t_refuse_opt.c,v 1.8 2017/01/13 21:30:41 christos Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_refuse_opt.c,v 1.7 2016/11/21 16:26:16 christos Exp $");
+__RCSID("$NetBSD: t_refuse_opt.c,v 1.8 2017/01/13 21:30:41 christos Exp $");
#define _KERNTYPES
#include <sys/types.h>
@@ -35,7 +35,7 @@ __RCSID("$NetBSD: t_refuse_opt.c,v 1.7 2
#include <fuse.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(t_fuse_opt_add_arg);
ATF_TC_HEAD(t_fuse_opt_add_arg, tc)
Index: src/tests/lib/librumpclient/t_fd.c
diff -u src/tests/lib/librumpclient/t_fd.c:1.5 src/tests/lib/librumpclient/t_fd.c:1.6
--- src/tests/lib/librumpclient/t_fd.c:1.5 Wed Aug 10 17:10:18 2016
+++ src/tests/lib/librumpclient/t_fd.c Fri Jan 13 16:30:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fd.c,v 1.5 2016/08/10 21:10:18 kre Exp $ */
+/* $NetBSD: t_fd.c,v 1.6 2017/01/13 21:30:41 christos Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include <rump/rumpclient.h>
#include <rump/rump_syscalls.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC_WITH_CLEANUP(bigenough);
ATF_TC_HEAD(bigenough, tc)
Index: src/tests/lib/semaphore/sem.c
diff -u src/tests/lib/semaphore/sem.c:1.10 src/tests/lib/semaphore/sem.c:1.11
--- src/tests/lib/semaphore/sem.c:1.10 Fri Mar 9 09:25:34 2012
+++ src/tests/lib/semaphore/sem.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.10 2012/03/09 14:25:34 joerg Exp $ */
+/* $NetBSD: sem.c,v 1.11 2017/01/13 21:30:42 christos Exp $ */
/*
* Common code for semaphore tests. This can be included both into
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(postwait);
ATF_TC_HEAD(postwait, tc)
Index: src/tests/libexec/ld.elf_so/t_dlerror-cleared.c
diff -u src/tests/libexec/ld.elf_so/t_dlerror-cleared.c:1.1 src/tests/libexec/ld.elf_so/t_dlerror-cleared.c:1.2
--- src/tests/libexec/ld.elf_so/t_dlerror-cleared.c:1.1 Tue Dec 14 00:57:32 2010
+++ src/tests/libexec/ld.elf_so/t_dlerror-cleared.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_dlerror-cleared.c,v 1.1 2010/12/14 05:57:32 skrll Exp $ */
+/* $NetBSD: t_dlerror-cleared.c,v 1.2 2017/01/13 21:30:42 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <dlfcn.h>
#include <link_elf.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(rtld_dlerror_cleared);
ATF_TC_HEAD(rtld_dlerror_cleared, tc)
Index: src/tests/libexec/ld.elf_so/t_dlerror-false.c
diff -u src/tests/libexec/ld.elf_so/t_dlerror-false.c:1.1 src/tests/libexec/ld.elf_so/t_dlerror-false.c:1.2
--- src/tests/libexec/ld.elf_so/t_dlerror-false.c:1.1 Tue Dec 14 00:57:32 2010
+++ src/tests/libexec/ld.elf_so/t_dlerror-false.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_dlerror-false.c,v 1.1 2010/12/14 05:57:32 skrll Exp $ */
+/* $NetBSD: t_dlerror-false.c,v 1.2 2017/01/13 21:30:42 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <dlfcn.h>
#include <link_elf.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(rtld_dlerror_false);
ATF_TC_HEAD(rtld_dlerror_false, tc)
Index: src/tests/libexec/ld.elf_so/t_ifunc.c
diff -u src/tests/libexec/ld.elf_so/t_ifunc.c:1.1 src/tests/libexec/ld.elf_so/t_ifunc.c:1.2
--- src/tests/libexec/ld.elf_so/t_ifunc.c:1.1 Mon Aug 25 16:40:53 2014
+++ src/tests/libexec/ld.elf_so/t_ifunc.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ifunc.c,v 1.1 2014/08/25 20:40:53 joerg Exp $ */
+/* $NetBSD: t_ifunc.c,v 1.2 2017/01/13 21:30:42 christos Exp $ */
/*
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <dlfcn.h>
#include <util.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(rtld_ifunc);
Index: src/tests/libexec/ld.elf_so/t_dlinfo.c
diff -u src/tests/libexec/ld.elf_so/t_dlinfo.c:1.4 src/tests/libexec/ld.elf_so/t_dlinfo.c:1.5
--- src/tests/libexec/ld.elf_so/t_dlinfo.c:1.4 Fri Mar 25 10:47:31 2011
+++ src/tests/libexec/ld.elf_so/t_dlinfo.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_dlinfo.c,v 1.4 2011/03/25 14:47:31 pooka Exp $ */
+/* $NetBSD: t_dlinfo.c,v 1.5 2017/01/13 21:30:42 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <dlfcn.h>
#include <link_elf.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(rtld_dlinfo_linkmap_self);
ATF_TC_HEAD(rtld_dlinfo_linkmap_self, tc)
Index: src/tests/modules/t_builtin.c
diff -u src/tests/modules/t_builtin.c:1.2 src/tests/modules/t_builtin.c:1.3
--- src/tests/modules/t_builtin.c:1.2 Wed Nov 3 12:10:23 2010
+++ src/tests/modules/t_builtin.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_builtin.c,v 1.2 2010/11/03 16:10:23 christos Exp $ */
+/* $NetBSD: t_builtin.c,v 1.3 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc. All rights reserved.
@@ -39,7 +39,7 @@
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
-#include "../h_macros.h"
+#include "h_macros.h"
#define MYMP "/mnt"
#define HZFILE MYMP "/hz"
Index: src/tests/net/bpf/t_bpf.c
diff -u src/tests/net/bpf/t_bpf.c:1.5 src/tests/net/bpf/t_bpf.c:1.6
--- src/tests/net/bpf/t_bpf.c:1.5 Tue Aug 14 15:40:30 2012
+++ src/tests/net/bpf/t_bpf.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bpf.c,v 1.5 2012/08/14 19:40:30 alnsn Exp $ */
+/* $NetBSD: t_bpf.c,v 1.6 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_bpf.c,v 1.5 2012/08/14 19:40:30 alnsn Exp $");
+__RCSID("$NetBSD: t_bpf.c,v 1.6 2017/01/13 21:30:42 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -50,7 +50,7 @@ __RCSID("$NetBSD: t_bpf.c,v 1.5 2012/08/
#undef m_data
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
#include "../config/netconfig.c"
ATF_TC(bpfwriteleak);
Index: src/tests/net/bpf/t_mbuf.c
diff -u src/tests/net/bpf/t_mbuf.c:1.2 src/tests/net/bpf/t_mbuf.c:1.3
--- src/tests/net/bpf/t_mbuf.c:1.2 Tue Jul 8 17:44:26 2014
+++ src/tests/net/bpf/t_mbuf.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mbuf.c,v 1.2 2014/07/08 21:44:26 alnsn Exp $ */
+/* $NetBSD: t_mbuf.c,v 1.3 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2014 Alexander Nasonov.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mbuf.c,v 1.2 2014/07/08 21:44:26 alnsn Exp $");
+__RCSID("$NetBSD: t_mbuf.c,v 1.3 2017/01/13 21:30:42 christos Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: t_mbuf.c,v 1.2 2014/07
#undef m_data
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
static bool
test_ldb_abs(size_t split)
Index: src/tests/net/bpfilter/t_bpfilter.c
diff -u src/tests/net/bpfilter/t_bpfilter.c:1.10 src/tests/net/bpfilter/t_bpfilter.c:1.11
--- src/tests/net/bpfilter/t_bpfilter.c:1.10 Wed Feb 11 18:39:07 2015
+++ src/tests/net/bpfilter/t_bpfilter.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bpfilter.c,v 1.10 2015/02/11 23:39:07 alnsn Exp $ */
+/* $NetBSD: t_bpfilter.c,v 1.11 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_bpfilter.c,v 1.10 2015/02/11 23:39:07 alnsn Exp $");
+__RCSID("$NetBSD: t_bpfilter.c,v 1.11 2017/01/13 21:30:42 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -53,7 +53,7 @@ __RCSID("$NetBSD: t_bpfilter.c,v 1.10 20
#undef m_data
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
#include "../config/netconfig.c"
Index: src/tests/net/bpfjit/t_bpfjit.c
diff -u src/tests/net/bpfjit/t_bpfjit.c:1.11 src/tests/net/bpfjit/t_bpfjit.c:1.12
--- src/tests/net/bpfjit/t_bpfjit.c:1.11 Sat Feb 14 17:34:33 2015
+++ src/tests/net/bpfjit/t_bpfjit.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bpfjit.c,v 1.11 2015/02/14 22:34:33 alnsn Exp $ */
+/* $NetBSD: t_bpfjit.c,v 1.12 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2011-2012, 2014-2015 Alexander Nasonov.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_bpfjit.c,v 1.11 2015/02/14 22:34:33 alnsn Exp $");
+__RCSID("$NetBSD: t_bpfjit.c,v 1.12 2017/01/13 21:30:42 christos Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -49,7 +49,7 @@ __RCSID("$NetBSD: t_bpfjit.c,v 1.11 2015
#undef m_data
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
static uint8_t deadbeef_at_5[16] = {
Index: src/tests/net/bpfjit/t_cop.c
diff -u src/tests/net/bpfjit/t_cop.c:1.3 src/tests/net/bpfjit/t_cop.c:1.4
--- src/tests/net/bpfjit/t_cop.c:1.3 Sun Jul 13 17:35:33 2014
+++ src/tests/net/bpfjit/t_cop.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cop.c,v 1.3 2014/07/13 21:35:33 alnsn Exp $ */
+/* $NetBSD: t_cop.c,v 1.4 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2014 Alexander Nasonov.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_cop.c,v 1.3 2014/07/13 21:35:33 alnsn Exp $");
+__RCSID("$NetBSD: t_cop.c,v 1.4 2017/01/13 21:30:42 christos Exp $");
#include <stdint.h>
#include <string.h>
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: t_cop.c,v 1.3 2014/07/
#undef m_data
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
static uint32_t retA(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
static uint32_t retBL(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
Index: src/tests/net/bpfjit/t_extmem.c
diff -u src/tests/net/bpfjit/t_extmem.c:1.1 src/tests/net/bpfjit/t_extmem.c:1.2
--- src/tests/net/bpfjit/t_extmem.c:1.1 Wed Jul 9 09:49:49 2014
+++ src/tests/net/bpfjit/t_extmem.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_extmem.c,v 1.1 2014/07/09 13:49:49 alnsn Exp $ */
+/* $NetBSD: t_extmem.c,v 1.2 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2014 Alexander Nasonov.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_extmem.c,v 1.1 2014/07/09 13:49:49 alnsn Exp $");
+__RCSID("$NetBSD: t_extmem.c,v 1.2 2017/01/13 21:30:42 christos Exp $");
#include <stdint.h>
#include <string.h>
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: t_extmem.c,v 1.1 2014/
#undef m_data
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
static uint32_t retM(const bpf_ctx_t *bc, bpf_args_t *args, uint32_t A);
Index: src/tests/net/bpfjit/t_mbuf.c
diff -u src/tests/net/bpfjit/t_mbuf.c:1.1 src/tests/net/bpfjit/t_mbuf.c:1.2
--- src/tests/net/bpfjit/t_mbuf.c:1.1 Tue Jul 8 17:45:55 2014
+++ src/tests/net/bpfjit/t_mbuf.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mbuf.c,v 1.1 2014/07/08 21:45:55 alnsn Exp $ */
+/* $NetBSD: t_mbuf.c,v 1.2 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2014 Alexander Nasonov.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mbuf.c,v 1.1 2014/07/08 21:45:55 alnsn Exp $");
+__RCSID("$NetBSD: t_mbuf.c,v 1.2 2017/01/13 21:30:42 christos Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -48,7 +48,7 @@ __RCSID("$NetBSD: t_mbuf.c,v 1.1 2014/07
#undef m_data
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
static bool
test_ldb_abs(size_t split)
Index: src/tests/net/carp/t_basic.c
diff -u src/tests/net/carp/t_basic.c:1.5 src/tests/net/carp/t_basic.c:1.6
--- src/tests/net/carp/t_basic.c:1.5 Sun Jun 26 09:13:31 2011
+++ src/tests/net/carp/t_basic.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_basic.c,v 1.5 2011/06/26 13:13:31 christos Exp $ */
+/* $NetBSD: t_basic.c,v 1.6 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: t_basic.c,v 1.5 2011/06/26 13:13:31 christos Exp $");
+__RCSID("$NetBSD: t_basic.c,v 1.6 2017/01/13 21:30:42 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -52,7 +52,7 @@ __RCSID("$NetBSD: t_basic.c,v 1.5 2011/0
#include <signal.h>
#include "../config/netconfig.c"
-#include "../../h_macros.h"
+#include "h_macros.h"
static bool oknow = false;
Index: src/tests/net/config/netconfig.c
diff -u src/tests/net/config/netconfig.c:1.8 src/tests/net/config/netconfig.c:1.9
--- src/tests/net/config/netconfig.c:1.8 Wed Jul 3 15:13:33 2013
+++ src/tests/net/config/netconfig.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: netconfig.c,v 1.8 2013/07/03 19:13:33 pooka Exp $ */
+/* $NetBSD: netconfig.c,v 1.9 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: netconfig.c,v 1.8 2013/07/03 19:13:33 pooka Exp $");
+__RCSID("$NetBSD: netconfig.c,v 1.9 2017/01/13 21:30:42 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -53,7 +53,7 @@ __RCSID("$NetBSD: netconfig.c,v 1.8 2013
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
int noatf;
Index: src/tests/net/icmp/t_forward.c
diff -u src/tests/net/icmp/t_forward.c:1.9 src/tests/net/icmp/t_forward.c:1.10
--- src/tests/net/icmp/t_forward.c:1.9 Thu Feb 26 08:03:21 2015
+++ src/tests/net/icmp/t_forward.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_forward.c,v 1.9 2015/02/26 13:03:21 martin Exp $ */
+/* $NetBSD: t_forward.c,v 1.10 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: t_forward.c,v 1.9 2015/02/26 13:03:21 martin Exp $");
+__RCSID("$NetBSD: t_forward.c,v 1.10 2017/01/13 21:30:42 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -57,7 +57,7 @@ __RCSID("$NetBSD: t_forward.c,v 1.9 2015
#include <string.h>
#include <unistd.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
#include "../config/netconfig.c"
/*
Index: src/tests/net/icmp/t_ping.c
diff -u src/tests/net/icmp/t_ping.c:1.16 src/tests/net/icmp/t_ping.c:1.17
--- src/tests/net/icmp/t_ping.c:1.16 Thu Feb 26 08:06:10 2015
+++ src/tests/net/icmp/t_ping.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ping.c,v 1.16 2015/02/26 13:06:10 martin Exp $ */
+/* $NetBSD: t_ping.c,v 1.17 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: t_ping.c,v 1.16 2015/02/26 13:06:10 martin Exp $");
+__RCSID("$NetBSD: t_ping.c,v 1.17 2017/01/13 21:30:42 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -52,7 +52,7 @@ __RCSID("$NetBSD: t_ping.c,v 1.16 2015/0
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
#include "../config/netconfig.c"
ATF_TC(simpleping);
Index: src/tests/net/if_loop/t_pr.c
diff -u src/tests/net/if_loop/t_pr.c:1.7 src/tests/net/if_loop/t_pr.c:1.8
--- src/tests/net/if_loop/t_pr.c:1.7 Sun Mar 18 05:46:50 2012
+++ src/tests/net/if_loop/t_pr.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pr.c,v 1.7 2012/03/18 09:46:50 jruoho Exp $ */
+/* $NetBSD: t_pr.c,v 1.8 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: t_pr.c,v 1.7 2012/03/18 09:46:50 jruoho Exp $");
+__RCSID("$NetBSD: t_pr.c,v 1.8 2017/01/13 21:30:42 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -50,7 +50,7 @@ __RCSID("$NetBSD: t_pr.c,v 1.7 2012/03/1
#include <unistd.h>
#include "../config/netconfig.c"
-#include "../../h_macros.h"
+#include "h_macros.h"
/*
* Prepare rump, configure interface and route to cause fragmentation
Index: src/tests/net/net/t_raw.c
diff -u src/tests/net/net/t_raw.c:1.1 src/tests/net/net/t_raw.c:1.2
--- src/tests/net/net/t_raw.c:1.1 Tue Jan 11 05:51:45 2011
+++ src/tests/net/net/t_raw.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_raw.c,v 1.1 2011/01/11 10:51:45 pooka Exp $ */
+/* $NetBSD: t_raw.c,v 1.2 2017/01/13 21:30:42 christos Exp $ */
#include <sys/socket.h>
#include <sys/stat.h>
@@ -12,7 +12,7 @@
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(PRU_SENSE);
ATF_TC_HEAD(PRU_SENSE, tc)
Index: src/tests/rump/modautoload/t_modautoload.c
diff -u src/tests/rump/modautoload/t_modautoload.c:1.5 src/tests/rump/modautoload/t_modautoload.c:1.6
--- src/tests/rump/modautoload/t_modautoload.c:1.5 Tue Sep 13 23:19:11 2016
+++ src/tests/rump/modautoload/t_modautoload.c Fri Jan 13 16:30:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_modautoload.c,v 1.5 2016/09/14 03:19:11 ozaki-r Exp $ */
+/* $NetBSD: t_modautoload.c,v 1.6 2017/01/13 21:30:42 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(modautoload);
ATF_TC_HEAD(modautoload, tc)
Index: src/tests/rump/rumpkern/t_kern.c
diff -u src/tests/rump/rumpkern/t_kern.c:1.3 src/tests/rump/rumpkern/t_kern.c:1.4
--- src/tests/rump/rumpkern/t_kern.c:1.3 Mon Jan 30 08:05:52 2012
+++ src/tests/rump/rumpkern/t_kern.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_kern.c,v 1.3 2012/01/30 13:05:52 njoly Exp $ */
+/* $NetBSD: t_kern.c,v 1.4 2017/01/13 21:30:43 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
#include "../kernspace/kernspace.h"
#define LOCKFUN(_name_, _descr_,_needld_, _expect_) \
Index: src/tests/rump/rumpkern/t_vm.c
diff -u src/tests/rump/rumpkern/t_vm.c:1.3 src/tests/rump/rumpkern/t_vm.c:1.4
--- src/tests/rump/rumpkern/t_vm.c:1.3 Sat Mar 17 14:00:28 2012
+++ src/tests/rump/rumpkern/t_vm.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vm.c,v 1.3 2012/03/17 18:00:28 hannken Exp $ */
+/* $NetBSD: t_vm.c,v 1.4 2017/01/13 21:30:43 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
#include "../kernspace/kernspace.h"
ATF_TC(busypage);
Index: src/tests/rump/rumpkern/t_lwproc.c
diff -u src/tests/rump/rumpkern/t_lwproc.c:1.8 src/tests/rump/rumpkern/t_lwproc.c:1.9
--- src/tests/rump/rumpkern/t_lwproc.c:1.8 Tue Jan 10 17:36:29 2017
+++ src/tests/rump/rumpkern/t_lwproc.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_lwproc.c,v 1.8 2017/01/10 22:36:29 christos Exp $ */
+/* $NetBSD: t_lwproc.c,v 1.9 2017/01/13 21:30:43 christos Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include <unistd.h>
#include <util.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(makelwp);
ATF_TC_HEAD(makelwp, tc)
Index: src/tests/rump/rumpkern/t_modcmd.c
diff -u src/tests/rump/rumpkern/t_modcmd.c:1.9 src/tests/rump/rumpkern/t_modcmd.c:1.10
--- src/tests/rump/rumpkern/t_modcmd.c:1.9 Mon May 31 19:51:28 2010
+++ src/tests/rump/rumpkern/t_modcmd.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_modcmd.c,v 1.9 2010/05/31 23:51:28 pooka Exp $ */
+/* $NetBSD: t_modcmd.c,v 1.10 2017/01/13 21:30:43 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
#include <unistd.h>
#include <util.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
/*
* We verify that modules can be loaded and unloaded.
* tmpfs was chosen because it does not depend on an image.
Index: src/tests/rump/rumpkern/t_modlinkset.c
diff -u src/tests/rump/rumpkern/t_modlinkset.c:1.2 src/tests/rump/rumpkern/t_modlinkset.c:1.3
--- src/tests/rump/rumpkern/t_modlinkset.c:1.2 Fri Nov 6 10:26:54 2009
+++ src/tests/rump/rumpkern/t_modlinkset.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_modlinkset.c,v 1.2 2009/11/06 15:26:54 pooka Exp $ */
+/* $NetBSD: t_modlinkset.c,v 1.3 2017/01/13 21:30:43 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <errno.h>
#include <string.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(modlinkset);
ATF_TC_HEAD(modlinkset, tc)
Index: src/tests/rump/rumpkern/t_signals.c
diff -u src/tests/rump/rumpkern/t_signals.c:1.2 src/tests/rump/rumpkern/t_signals.c:1.3
--- src/tests/rump/rumpkern/t_signals.c:1.2 Sun Feb 20 14:45:45 2011
+++ src/tests/rump/rumpkern/t_signals.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_signals.c,v 1.2 2011/02/20 19:45:45 pooka Exp $ */
+/* $NetBSD: t_signals.c,v 1.3 2017/01/13 21:30:43 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <rump/rump.h>
#include "../kernspace/kernspace.h"
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(sigraise);
ATF_TC_HEAD(sigraise, tc)
Index: src/tests/rump/rumpkern/t_threads.c
diff -u src/tests/rump/rumpkern/t_threads.c:1.1 src/tests/rump/rumpkern/t_threads.c:1.2
--- src/tests/rump/rumpkern/t_threads.c:1.1 Mon May 31 19:36:12 2010
+++ src/tests/rump/rumpkern/t_threads.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_threads.c,v 1.1 2010/05/31 23:36:12 pooka Exp $ */
+/* $NetBSD: t_threads.c,v 1.2 2017/01/13 21:30:43 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
#include "../kernspace/kernspace.h"
ATF_TC(threadjoin);
Index: src/tests/rump/rumpkern/t_tsleep.c
diff -u src/tests/rump/rumpkern/t_tsleep.c:1.1 src/tests/rump/rumpkern/t_tsleep.c:1.2
--- src/tests/rump/rumpkern/t_tsleep.c:1.1 Mon May 31 19:36:12 2010
+++ src/tests/rump/rumpkern/t_tsleep.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_tsleep.c,v 1.1 2010/05/31 23:36:12 pooka Exp $ */
+/* $NetBSD: t_tsleep.c,v 1.2 2017/01/13 21:30:43 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <atf-c.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
#include "../kernspace/kernspace.h"
ATF_TC(tsleep);
Index: src/tests/rump/rumpvfs/t_basic.c
diff -u src/tests/rump/rumpvfs/t_basic.c:1.2 src/tests/rump/rumpvfs/t_basic.c:1.3
--- src/tests/rump/rumpvfs/t_basic.c:1.2 Tue Feb 22 08:25:18 2011
+++ src/tests/rump/rumpvfs/t_basic.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_basic.c,v 1.2 2011/02/22 13:25:18 pooka Exp $ */
+/* $NetBSD: t_basic.c,v 1.3 2017/01/13 21:30:43 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(lseekrv);
ATF_TC_HEAD(lseekrv, tc)
Index: src/tests/rump/rumpvfs/t_etfs.c
diff -u src/tests/rump/rumpvfs/t_etfs.c:1.10 src/tests/rump/rumpvfs/t_etfs.c:1.11
--- src/tests/rump/rumpvfs/t_etfs.c:1.10 Mon May 12 11:33:12 2014
+++ src/tests/rump/rumpvfs/t_etfs.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_etfs.c,v 1.10 2014/05/12 15:33:12 christos Exp $ */
+/* $NetBSD: t_etfs.c,v 1.11 2017/01/13 21:30:43 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(reregister_reg);
ATF_TC_HEAD(reregister_reg, tc)
Index: src/tests/rump/rumpvfs/t_p2kifs.c
diff -u src/tests/rump/rumpvfs/t_p2kifs.c:1.5 src/tests/rump/rumpvfs/t_p2kifs.c:1.6
--- src/tests/rump/rumpvfs/t_p2kifs.c:1.5 Mon Jan 25 06:45:57 2016
+++ src/tests/rump/rumpvfs/t_p2kifs.c Fri Jan 13 16:30:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_p2kifs.c,v 1.5 2016/01/25 11:45:57 pooka Exp $ */
+/* $NetBSD: t_p2kifs.c,v 1.6 2017/01/13 21:30:43 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(makecn);
ATF_TC_HEAD(makecn, tc)
Added files:
Index: src/tests/dev/Makefile.inc
diff -u /dev/null src/tests/dev/Makefile.inc:1.4
--- /dev/null Fri Jan 13 16:30:44 2017
+++ src/tests/dev/Makefile.inc Fri Jan 13 16:30:39 2017
@@ -0,0 +1,2 @@
+.include "../Makefile.inc"
+CPPFLAGS+=-D_KERNTYPES
