diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-13 01:33:15 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-13 01:33:15 +0000 |
| commit | 2774066ff905daa1fbb4d8b2ed4061dacf3abb02 (patch) | |
| tree | ec59a4e3e2df0a86d8a5cfa74d4e5f9d0f688e1c /regress/sys/nfs | |
| parent | dc254dfa8ef28c2657614aa41439706306aef01d (diff) | |
Make mount points and makefiles for file system tests consistent.
Link tests to the build.
Diffstat (limited to 'regress/sys/nfs')
| -rw-r--r-- | regress/sys/nfs/Makefile | 26 | ||||
| -rw-r--r-- | regress/sys/nfs/mmap-sysctl-copyin.c | 6 | ||||
| -rw-r--r-- | regress/sys/nfs/mmap-sysctl-copyout.c | 6 |
3 files changed, 21 insertions, 17 deletions
diff --git a/regress/sys/nfs/Makefile b/regress/sys/nfs/Makefile index 6e4abccba5a..7036de5407b 100644 --- a/regress/sys/nfs/Makefile +++ b/regress/sys/nfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2017/01/13 01:01:19 bluhm Exp $ +# $OpenBSD: Makefile,v 1.2 2017/01/13 01:33:14 bluhm Exp $ PROGS= mmap-sysctl-copyin mmap-sysctl-copyout OBJS= ${PROGS:S/$/.o/} @@ -12,26 +12,26 @@ disk: unconfig newfs vnd0c nfs: - grep '/mnt/nfs-server\>' /etc/exports || \ - echo /mnt/nfs-server -maproot=0:0 127.0.0.1 >>/etc/exports + grep '/mnt/regress-nfs-server\>' /etc/exports || \ + echo /mnt/regress-nfs-server -maproot=0:0 127.0.0.1 >>/etc/exports rcctl -f start portmap rcctl -f start nfsd rcctl -f start mountd mount: disk nfs - mkdir -p /mnt/nfs-server - mount /dev/vnd0c /mnt/nfs-server - mkdir -p /mnt/nfs-client - mount -t nfs 127.0.0.1:/mnt/nfs-server /mnt/nfs-client + mkdir -p /mnt/regress-nfs-server + mount /dev/vnd0c /mnt/regress-nfs-server + mkdir -p /mnt/regress-nfs-client + mount -t nfs 127.0.0.1:/mnt/regress-nfs-server /mnt/regress-nfs-client unconfig: -umount -f -t nfs -h 127.0.0.1 -a - -rmdir /mnt/nfs-client 2>/dev/null || true + -rmdir /mnt/regress-nfs-client 2>/dev/null || true -pkill mountd || true -rcctl -f stop nfsd -rcctl -f stop portmap -umount -f /dev/vnd0c 2>/dev/null || true - -rmdir /mnt/nfs-server 2>/dev/null || true + -rmdir /mnt/regress-nfs-server 2>/dev/null || true -vnconfig -u vnd0 2>/dev/null || true -rm -f stamp-setup @@ -47,14 +47,14 @@ stamp-setup: REGRESS_TARGETS+= run-regress-read run-regress-read: stamp-setup @echo '\n======== $@ ========' - echo -n $@ >/mnt/nfs-server/read - [ $@ = "`cat /mnt/nfs-client/read`" ] + echo -n $@ >/mnt/regress-nfs-server/read + [ $@ = "`cat /mnt/regress-nfs-client/read`" ] REGRESS_TARGETS+= run-regress-write run-regress-write: stamp-setup @echo '\n======== $@ ========' - echo -n $@ >/mnt/nfs-client/write - [ $@ = "`cat /mnt/nfs-server/write`" ] + echo -n $@ >/mnt/regress-nfs-client/write + [ $@ = "`cat /mnt/regress-nfs-server/write`" ] .for p in ${PROGS} REGRESS_TARGETS+= run-regress-${p} diff --git a/regress/sys/nfs/mmap-sysctl-copyin.c b/regress/sys/nfs/mmap-sysctl-copyin.c index 08d3b2b520d..9d333920d12 100644 --- a/regress/sys/nfs/mmap-sysctl-copyin.c +++ b/regress/sys/nfs/mmap-sysctl-copyin.c @@ -1,3 +1,5 @@ +/* $OpenBSD: mmap-sysctl-copyin.c,v 1.2 2017/01/13 01:33:14 bluhm Exp $ */ + #include <sys/param.h> #include <sys/mman.h> #include <sys/queue.h> @@ -18,8 +20,8 @@ #include <unistd.h> #define FILE "sysctl-net.inet.tcp.always_keepalive" -#define CLIENT "/mnt/nfs-client" -#define SERVER "/mnt/nfs-server" +#define CLIENT "/mnt/regress-nfs-client" +#define SERVER "/mnt/regress-nfs-server" int main(void) diff --git a/regress/sys/nfs/mmap-sysctl-copyout.c b/regress/sys/nfs/mmap-sysctl-copyout.c index 8f8621efb9c..10c804df389 100644 --- a/regress/sys/nfs/mmap-sysctl-copyout.c +++ b/regress/sys/nfs/mmap-sysctl-copyout.c @@ -1,3 +1,5 @@ +/* $OpenBSD: mmap-sysctl-copyout.c,v 1.2 2017/01/13 01:33:14 bluhm Exp $ */ + #include <sys/param.h> #include <sys/mman.h> #include <sys/queue.h> @@ -18,8 +20,8 @@ #include <unistd.h> #define FILE "sysctl-net.inet.tcp.stats" -#define CLIENT "/mnt/nfs-client" -#define SERVER "/mnt/nfs-server" +#define CLIENT "/mnt/regress-nfs-client" +#define SERVER "/mnt/regress-nfs-server" int main(void) |