Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests Don't play with "../.." in includes for h_macros.h; de...
details: https://anonhg.NetBSD.org/src/rev/68b8ccf1fe04
branches: trunk
changeset: 820717:68b8ccf1fe04
user: christos <christos%NetBSD.org@localhost>
date: Fri Jan 13 21:30:39 2017 +0000
description:
Don't play with "../.." in includes for h_macros.h; deal with it centrally.
Minor fixes.
diffstat:
tests/Makefile.inc | 3 ++-
tests/dev/Makefile.inc | 2 ++
tests/dev/cgd/t_cgd_3des.c | 4 ++--
tests/dev/cgd/t_cgd_aes.c | 4 ++--
tests/dev/cgd/t_cgd_blowfish.c | 4 ++--
tests/dev/clock_subr/t_clock_subr.c | 10 +++++-----
tests/dev/scsipi/t_cd.c | 4 ++--
tests/dev/sysmon/t_swwdog.c | 4 ++--
tests/fs/common/h_fsmacros.h | 4 ++--
tests/fs/ffs/h_quota2_tests.c | 4 ++--
tests/fs/ffs/t_fifos.c | 4 ++--
tests/fs/ffs/t_mount.c | 4 ++--
tests/fs/ffs/t_quota2_1.c | 4 ++--
tests/fs/ffs/t_quota2_remount.c | 4 ++--
tests/fs/ffs/t_snapshot.c | 4 ++--
tests/fs/ffs/t_snapshot_log.c | 4 ++--
tests/fs/ffs/t_snapshot_v2.c | 4 ++--
tests/fs/hfs/t_pathconvert.c | 4 ++--
tests/fs/kernfs/t_basic.c | 4 ++--
tests/fs/lfs/t_pr.c | 4 ++--
tests/fs/msdosfs/t_snapshot.c | 4 ++--
tests/fs/nfs/t_mountd.c | 4 ++--
tests/fs/nullfs/t_basic.c | 4 ++--
tests/fs/ptyfs/t_nullpts.c | 4 ++--
tests/fs/ptyfs/t_ptyfs.c | 4 ++--
tests/fs/puffs/t_basic.c | 4 ++--
tests/fs/puffs/t_fuzz.c | 4 ++--
tests/fs/puffs/t_io.c | 4 ++--
tests/fs/tmpfs/t_renamerace.c | 4 ++--
tests/fs/umapfs/t_basic.c | 4 ++--
tests/fs/union/t_pr.c | 4 ++--
tests/fs/vfs/t_full.c | 4 ++--
tests/fs/vfs/t_io.c | 4 ++--
tests/fs/vfs/t_renamerace.c | 4 ++--
tests/fs/vfs/t_ro.c | 4 ++--
tests/fs/vfs/t_union.c | 4 ++--
tests/fs/vfs/t_unpriv.c | 4 ++--
tests/fs/vfs/t_vfsops.c | 4 ++--
tests/fs/vfs/t_vnops.c | 4 ++--
tests/include/sys/t_socket.c | 4 ++--
tests/kernel/arch/amd64/t_ptrace_wait.c | 6 +++---
tests/kernel/arch/i386/t_ptrace_wait.c | 6 +++---
tests/kernel/kqueue/read/t_fifo.c | 6 +++---
tests/kernel/kqueue/read/t_file.c | 6 +++---
tests/kernel/kqueue/read/t_file2.c | 6 +++---
tests/kernel/kqueue/read/t_pipe.c | 6 +++---
tests/kernel/kqueue/read/t_ttypty.c | 6 +++---
tests/kernel/kqueue/t_ioctl.c | 6 +++---
tests/kernel/kqueue/t_proc1.c | 6 +++---
tests/kernel/kqueue/t_proc2.c | 6 +++---
tests/kernel/kqueue/t_proc3.c | 6 +++---
tests/kernel/kqueue/t_sig.c | 6 +++---
tests/kernel/kqueue/write/t_fifo.c | 6 +++---
tests/kernel/kqueue/write/t_pipe.c | 6 +++---
tests/kernel/kqueue/write/t_ttypty.c | 6 +++---
tests/kernel/t_extent.c | 6 +++---
tests/kernel/t_filedesc.c | 6 +++---
tests/kernel/t_lock.c | 6 +++---
tests/kernel/t_ptrace.c | 6 +++---
tests/kernel/t_ptrace_wait.c | 6 +++---
tests/kernel/t_pty.c | 6 +++---
tests/kernel/t_rnd.c | 6 +++---
tests/lib/libc/gen/t_glob.c | 6 +++---
tests/lib/libc/sys/t_clock_gettime.c | 6 +++---
tests/lib/libc/sys/t_pipe.c | 6 +++---
tests/lib/libc/sys/t_posix_fadvise.c | 6 +++---
tests/lib/libc/sys/t_sigaction.c | 6 +++---
tests/lib/libposix/t_rename.c | 6 +++---
tests/lib/librefuse/t_refuse_opt.c | 6 +++---
tests/lib/librumpclient/t_fd.c | 4 ++--
tests/lib/semaphore/sem.c | 4 ++--
tests/libexec/ld.elf_so/t_dlerror-cleared.c | 4 ++--
tests/libexec/ld.elf_so/t_dlerror-false.c | 4 ++--
tests/libexec/ld.elf_so/t_dlinfo.c | 4 ++--
tests/libexec/ld.elf_so/t_ifunc.c | 4 ++--
tests/modules/t_builtin.c | 4 ++--
tests/net/bpf/t_bpf.c | 6 +++---
tests/net/bpf/t_mbuf.c | 6 +++---
tests/net/bpfilter/t_bpfilter.c | 6 +++---
tests/net/bpfjit/t_bpfjit.c | 6 +++---
tests/net/bpfjit/t_cop.c | 6 +++---
tests/net/bpfjit/t_extmem.c | 6 +++---
tests/net/bpfjit/t_mbuf.c | 6 +++---
tests/net/carp/t_basic.c | 6 +++---
tests/net/config/netconfig.c | 6 +++---
tests/net/icmp/t_forward.c | 6 +++---
tests/net/icmp/t_ping.c | 6 +++---
tests/net/if_loop/t_pr.c | 6 +++---
tests/net/net/t_raw.c | 4 ++--
tests/rump/modautoload/t_modautoload.c | 4 ++--
tests/rump/rumpkern/t_kern.c | 4 ++--
tests/rump/rumpkern/t_lwproc.c | 4 ++--
tests/rump/rumpkern/t_modcmd.c | 4 ++--
tests/rump/rumpkern/t_modlinkset.c | 4 ++--
tests/rump/rumpkern/t_signals.c | 4 ++--
tests/rump/rumpkern/t_threads.c | 4 ++--
tests/rump/rumpkern/t_tsleep.c | 4 ++--
tests/rump/rumpkern/t_vm.c | 4 ++--
tests/rump/rumpvfs/t_basic.c | 4 ++--
tests/rump/rumpvfs/t_etfs.c | 4 ++--
tests/rump/rumpvfs/t_p2kifs.c | 4 ++--
101 files changed, 246 insertions(+), 243 deletions(-)
diffs (truncated from 2186 to 300 lines):
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/Makefile.inc
--- a/tests/Makefile.inc Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/Makefile.inc Fri Jan 13 21:30:39 2017 +0000
@@ -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}
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/dev/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/dev/Makefile.inc Fri Jan 13 21:30:39 2017 +0000
@@ -0,0 +1,2 @@
+.include "../Makefile.inc"
+CPPFLAGS+=-D_KERNTYPES
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/dev/cgd/t_cgd_3des.c
--- a/tests/dev/cgd/t_cgd_3des.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/dev/cgd/t_cgd_3des.c Fri Jan 13 21:30:39 2017 +0000
@@ -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
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/dev/cgd/t_cgd_aes.c
--- a/tests/dev/cgd/t_cgd_aes.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/dev/cgd/t_cgd_aes.c Fri Jan 13 21:30:39 2017 +0000
@@ -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
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/dev/cgd/t_cgd_blowfish.c
--- a/tests/dev/cgd/t_cgd_blowfish.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/dev/cgd/t_cgd_blowfish.c Fri Jan 13 21:30:39 2017 +0000
@@ -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
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/dev/clock_subr/t_clock_subr.c
--- a/tests/dev/clock_subr/t_clock_subr.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/dev/clock_subr/t_clock_subr.c Fri Jan 13 21:30:39 2017 +0000
@@ -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 @@
#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
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/dev/scsipi/t_cd.c
--- a/tests/dev/scsipi/t_cd.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/dev/scsipi/t_cd.c Fri Jan 13 21:30:39 2017 +0000
@@ -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)
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/dev/sysmon/t_swwdog.c
--- a/tests/dev/sysmon/t_swwdog.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/dev/sysmon/t_swwdog.c Fri Jan 13 21:30:39 2017 +0000
@@ -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;
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/fs/common/h_fsmacros.h
--- a/tests/fs/common/h_fsmacros.h Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/fs/common/h_fsmacros.h Fri Jan 13 21:30:39 2017 +0000
@@ -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 *, \
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/fs/ffs/h_quota2_tests.c
--- a/tests/fs/ffs/h_quota2_tests.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/fs/ffs/h_quota2_tests.c Fri Jan 13 21:30:39 2017 +0000
@@ -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;
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/fs/ffs/t_fifos.c
--- a/tests/fs/ffs/t_fifos.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/fs/ffs/t_fifos.c Fri Jan 13 21:30:39 2017 +0000
@@ -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)
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/fs/ffs/t_mount.c
--- a/tests/fs/ffs/t_mount.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/fs/ffs/t_mount.c Fri Jan 13 21:30:39 2017 +0000
@@ -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)
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/fs/ffs/t_quota2_1.c
--- a/tests/fs/ffs/t_quota2_1.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/fs/ffs/t_quota2_1.c Fri Jan 13 21:30:39 2017 +0000
@@ -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)
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/fs/ffs/t_quota2_remount.c
--- a/tests/fs/ffs/t_quota2_remount.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/fs/ffs/t_quota2_remount.c Fri Jan 13 21:30:39 2017 +0000
@@ -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)
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/fs/ffs/t_snapshot.c
--- a/tests/fs/ffs/t_snapshot.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/fs/ffs/t_snapshot.c Fri Jan 13 21:30:39 2017 +0000
@@ -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
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/fs/ffs/t_snapshot_log.c
--- a/tests/fs/ffs/t_snapshot_log.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/fs/ffs/t_snapshot_log.c Fri Jan 13 21:30:39 2017 +0000
@@ -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
diff -r 6ef4abcbe8a1 -r 68b8ccf1fe04 tests/fs/ffs/t_snapshot_v2.c
--- a/tests/fs/ffs/t_snapshot_v2.c Fri Jan 13 21:19:45 2017 +0000
+++ b/tests/fs/ffs/t_snapshot_v2.c Fri Jan 13 21:30:39 2017 +0000
@@ -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>
Home |
Main Index |
Thread Index |
Old Index