summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2017-07-07 23:55:22 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2017-07-07 23:55:22 +0000
commit791ad752c53dd38a5b49a569b22c8ab3df49fc65 (patch)
tree4f6fbfdcb158cdd530396904c8730b644c1b27c0 /regress
parentb8f2af29f9736cb5d33eac1c9aadf891c831a74f (diff)
Remove all references to "make depend" from regress.
Diffstat (limited to 'regress')
-rw-r--r--regress/Makefile7
-rw-r--r--regress/lib/libedit/chared/test_gets.c3
-rw-r--r--regress/lib/libedit/keymacro/test_get.c3
-rw-r--r--regress/lib/libpthread/Makefile4
-rw-r--r--regress/sbin/pfctl/Makefile4
-rw-r--r--regress/sbin/route/Makefile4
-rw-r--r--regress/usr.bin/cvs/Makefile3
-rw-r--r--regress/usr.bin/mandoc/db/mlinks/mlinks.15
-rw-r--r--regress/usr.sbin/arp/Makefile4
9 files changed, 16 insertions, 21 deletions
diff --git a/regress/Makefile b/regress/Makefile
index 1e6970f69f7..ef9989bf914 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.21 2014/11/24 01:12:14 schwarze Exp $
+# $OpenBSD: Makefile,v 1.22 2017/07/07 23:55:21 bluhm Exp $
#
-# To run full regression tests you just need two steps:
-# 1. make depend
-# 2. make regress
+# To run full regression tests you just need one step:
+# make regress
#
# A normal "make" is not necessary and will simply do the same thing
# as "regress" (possibly with more bugs). This allows us to include
diff --git a/regress/lib/libedit/chared/test_gets.c b/regress/lib/libedit/chared/test_gets.c
index 40303299c84..f8c918eb053 100644
--- a/regress/lib/libedit/chared/test_gets.c
+++ b/regress/lib/libedit/chared/test_gets.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: test_gets.c,v 1.4 2017/07/05 15:31:45 bluhm Exp $ */
+/* $OpenBSD: test_gets.c,v 1.5 2017/07/07 23:55:21 bluhm Exp $ */
/*
* Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
*
@@ -29,7 +29,6 @@
* Rather than linking in all the various libedit modules,
* provide dummies for those functions called in chared.c.
* Most aren't actually called in c_gets().
- * Requires "make obj && make depend" in src/lib/libedit.
*/
#define EL EditLine *el __attribute__((__unused__))
diff --git a/regress/lib/libedit/keymacro/test_get.c b/regress/lib/libedit/keymacro/test_get.c
index 0b3e3be5eb2..12ec7602c7e 100644
--- a/regress/lib/libedit/keymacro/test_get.c
+++ b/regress/lib/libedit/keymacro/test_get.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: test_get.c,v 1.4 2017/07/05 15:31:45 bluhm Exp $ */
+/* $OpenBSD: test_get.c,v 1.5 2017/07/07 23:55:21 bluhm Exp $ */
/*
* Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
*
@@ -24,7 +24,6 @@
* Rather than linking in all the various libedit modules,
* provide dummies for those functions called in keymacro.c.
* Most aren't actually called in keymacro_get().
- * Requires "make obj && make depend" in src/lib/libedit.
*/
#define EL EditLine *el __attribute__((__unused__))
diff --git a/regress/lib/libpthread/Makefile b/regress/lib/libpthread/Makefile
index da38443c7f0..87bbc06040d 100644
--- a/regress/lib/libpthread/Makefile
+++ b/regress/lib/libpthread/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2016/05/10 03:59:55 guenther Exp $
+# $OpenBSD: Makefile,v 1.48 2017/07/07 23:55:21 bluhm Exp $
# disabled because it requires a buggy behavior that uthread had:
# dup2_race
@@ -35,7 +35,7 @@ install:
.PHONY: testall
testall:
rm -f /tmp/thread-{shared,static,debug}
- make cleandir && make obj && make depend && \
+ make cleandir && make obj && \
REGRESS_LOG=/tmp/thread-shared make
(export LDFLAGS="-static ${NOPIE_LDFLAGS}"; make clean && \
REGRESS_LOG=/tmp/thread-static make)
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index c3b650c7e23..d536ff69ea4 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.224 2016/09/30 14:27:52 otto Exp $
+# $OpenBSD: Makefile,v 1.225 2017/07/07 23:55:21 bluhm Exp $
# TARGETS
# pf: feed pfNN.in through pfctl and check whether the output matches pfNN.ok
@@ -36,7 +36,7 @@ SHELL=/bin/sh
.MAIN: all
-.ifmake !obj && !clean && !cleandir && !depend && !regress
+.ifmake !obj && !clean && !cleandir && !regress
.if (${.TARGET} != all && ! make(all)) || (${.TARGET} == all)
.BEGIN:
-${SUDO} ifconfig lo1000000 create
diff --git a/regress/sbin/route/Makefile b/regress/sbin/route/Makefile
index cf394a8822f..269ce8751b4 100644
--- a/regress/sbin/route/Makefile
+++ b/regress/sbin/route/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2017/05/30 11:57:59 bluhm Exp $
+# $OpenBSD: Makefile,v 1.16 2017/07/07 23:55:21 bluhm Exp $
RDOMAIN?= 5
.MAIN: all
-.ifmake !obj && !clean && !cleandir && !depend && !regress
+.ifmake !obj && !clean && !cleandir && !regress
.if (${.TARGET} != all && ! make(all)) || (${.TARGET} == all)
.SILENT: .BEGIN .END
diff --git a/regress/usr.bin/cvs/Makefile b/regress/usr.bin/cvs/Makefile
index cbfe6cbcbeb..a02ca0298d7 100644
--- a/regress/usr.bin/cvs/Makefile
+++ b/regress/usr.bin/cvs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2016/09/30 22:11:37 bluhm Exp $
+# $OpenBSD: Makefile,v 1.32 2017/07/07 23:55:21 bluhm Exp $
# Regression tests by Niall O'Higgins <niallo@openbsd.org> and
# Tobias Stoeckmann <tobias@openbsd.org>.
@@ -348,7 +348,6 @@ clean:
# opencvs is not linked to the build, so make it on demand as a workaround
${OPENCVS}:
cd ${BSDSRCDIR}/usr.bin/cvs && ${MAKE} obj
- cd ${BSDSRCDIR}/usr.bin/cvs && ${MAKE} depend
cd ${BSDSRCDIR}/usr.bin/cvs && ${MAKE} all
.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/db/mlinks/mlinks.1 b/regress/usr.bin/mandoc/db/mlinks/mlinks.1
index da76ac2b59f..9aa6480b0d7 100644
--- a/regress/usr.bin/mandoc/db/mlinks/mlinks.1
+++ b/regress/usr.bin/mandoc/db/mlinks/mlinks.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mlinks.1,v 1.3 2016/11/05 16:06:12 bcook Exp $
+.\" $OpenBSD: mlinks.1,v 1.4 2017/07/07 23:55:21 bluhm Exp $
.\"
.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 5 2016 $
+.Dd $Mdocdate: July 7 2017 $
.Dt MLINKS 1
.Os
.Sh NAME
@@ -74,7 +74,6 @@ Typical usage looks like this:
.Bd -literal -offset indent
cd /usr/src/usr.bin/mandoc/
make obj
-make depend
make
cd /usr/src/regress/usr.bin/mandoc/db/mlinks/
make obj
diff --git a/regress/usr.sbin/arp/Makefile b/regress/usr.sbin/arp/Makefile
index d0a77d52043..0350a7b8bd8 100644
--- a/regress/usr.sbin/arp/Makefile
+++ b/regress/usr.sbin/arp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2016/03/24 15:15:41 mpi Exp $
+# $OpenBSD: Makefile,v 1.3 2017/07/07 23:55:21 bluhm Exp $
RDOMAIN?= 5
VETHER_MAC= fe:e1:ba:d2:a3:18
@@ -8,7 +8,7 @@ OTHER_MAC= cc:77:55:22:aa:66
.MAIN: all
-.ifmake !obj && !clean && !cleandir && !depend && !regress
+.ifmake !obj && !clean && !cleandir && !regress
.if (${.TARGET} != all && ! make(all)) || (${.TARGET} == all)
.SILENT: .BEGIN .END .INTERRUPT