diff options
| author |   bluhm <bluhm@openbsd.org> | 2017-01-27 13:35:14 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2017-01-27 13:35:14 +0000 |
| commit | adebd9bebaec8b62a07eff396d36debc37d055a1 (patch) | |
| tree | ec13eab2aca43e8f6401d4487233ae4aff664aa6 | |
| parent | install libcxxabi and libcxx headers when COMPILER_VERSION is clang (diff) | |
| download | wireguard-openbsd-adebd9bebaec8b62a07eff396d36debc37d055a1.tar.xz wireguard-openbsd-adebd9bebaec8b62a07eff396d36debc37d055a1.zip | |
Make sure that the fstest program has been build when running in
the ffs and nfs subdirs.
| -rw-r--r-- | regress/sys/ffs/ffs/Makefile | 7 | ||||
| -rw-r--r-- | regress/sys/ffs/nfs/Makefile | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/regress/sys/ffs/ffs/Makefile b/regress/sys/ffs/ffs/Makefile index afbcd984b0e..7ee793b0e81 100644 --- a/regress/sys/ffs/ffs/Makefile +++ b/regress/sys/ffs/ffs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2017/01/18 11:56:10 bluhm Exp $ +# $OpenBSD: Makefile,v 1.3 2017/01/27 13:35:14 bluhm Exp $ TESTS= chflags chmod chown link mkdir mkfifo open rename rmdir \ symlink truncate unlink @@ -27,9 +27,12 @@ stamp-setup: ${.MAKE} -C ${.CURDIR} mount date >$@ +${.OBJDIR}/../fstest: + ${.MAKE} -C ${.CURDIR}/.. fstest + .for t in ${TESTS} REGRESS_TARGETS+= run-regress-${t} -run-regress-${t}: stamp-setup +run-regress-${t}: stamp-setup ${.OBJDIR}/../fstest @echo '\n======== $@ ========' cd /mnt/regress-ffs && env FSTEST=${.OBJDIR}/../fstest \ /bin/sh ${.CURDIR}/../run ${.CURDIR}/../tests/${t}/*.t diff --git a/regress/sys/ffs/nfs/Makefile b/regress/sys/ffs/nfs/Makefile index 7f2b09fd6e9..ec0d100fdd6 100644 --- a/regress/sys/ffs/nfs/Makefile +++ b/regress/sys/ffs/nfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2017/01/18 11:56:10 bluhm Exp $ +# $OpenBSD: Makefile,v 1.4 2017/01/27 13:35:14 bluhm Exp $ TESTS= chflags chmod chown link mkdir mkfifo open rename rmdir \ symlink truncate unlink @@ -40,9 +40,12 @@ stamp-setup: ${.MAKE} -C ${.CURDIR} mount date >$@ +${.OBJDIR}/../fstest: + ${.MAKE} -C ${.CURDIR}/.. fstest + .for t in ${TESTS} REGRESS_TARGETS+= run-regress-${t} -run-regress-${t}: stamp-setup +run-regress-${t}: stamp-setup ${.OBJDIR}/../fstest @echo '\n======== $@ ========' cd /mnt/regress-nfs-client && env FSTEST=${.OBJDIR}/../fstest \ /bin/sh ${.CURDIR}/../run ${.CURDIR}/../tests/${t}/*.t |