summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-10-16 14:02:24 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-12-21 14:04:08 +1100
commitbf7eb3c266b7fd4ddda108fcf72b860af2af6406 (patch)
tree5dcccc7af0c289a3bfa1fa5ed9503d3221af2165
parent2c64f24e27a5e72a7f59e515fc4f4985355237ae (diff)
upstream: few more things needs match.c and addrmatch.c now that
log.c calls match_pattern_list() OpenBSD-Regress-ID: f7c95c76b150d0aeb00a67858b9579b7d1b2db74
-rw-r--r--regress/unittests/conversion/Makefile3
-rw-r--r--regress/unittests/misc/Makefile4
-rw-r--r--regress/unittests/sshbuf/Makefile3
3 files changed, 7 insertions, 3 deletions
diff --git a/regress/unittests/conversion/Makefile b/regress/unittests/conversion/Makefile
index 8b2a09cc..5ec667bf 100644
--- a/regress/unittests/conversion/Makefile
+++ b/regress/unittests/conversion/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2017/12/21 00:41:22 djm Exp $
+# $OpenBSD: Makefile,v 1.3 2020/10/16 14:02:24 djm Exp $
PROG=test_conversion
SRCS=tests.c
@@ -6,6 +6,7 @@ SRCS=tests.c
# From usr.bin/ssh
SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
SRCS+=atomicio.c misc.c xmalloc.c log.c uidswap.c cleanup.c fatal.c ssherr.c
+SRCS+=match.c addrmatch.c
REGRESS_TARGETS=run-regress-${PROG}
diff --git a/regress/unittests/misc/Makefile b/regress/unittests/misc/Makefile
index 0c8ebc7d..6f0df8ec 100644
--- a/regress/unittests/misc/Makefile
+++ b/regress/unittests/misc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/08/22 21:47:27 bluhm Exp $
+# $OpenBSD: Makefile,v 1.3 2020/10/16 14:02:24 djm Exp $
PROG=test_misc
SRCS=tests.c
@@ -11,6 +11,8 @@ SRCS+= ssherr.c
SRCS+= log.c
SRCS+= xmalloc.c
SRCS+= misc.c
+SRCS+= match.c
+SRCS+= addrmatch.c
# From usr.bin/ssh/sshd/Makefile
SRCS+= atomicio.c cleanup.c fatal.c
diff --git a/regress/unittests/sshbuf/Makefile b/regress/unittests/sshbuf/Makefile
index 5f6c4426..56d91cc2 100644
--- a/regress/unittests/sshbuf/Makefile
+++ b/regress/unittests/sshbuf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2020/01/26 00:09:50 djm Exp $
+# $OpenBSD: Makefile,v 1.9 2020/10/16 14:02:24 djm Exp $
# $OpenBSD: Makefile,v 1.8 2020/01/26 00:09:50 djm Exp $
@@ -15,6 +15,7 @@ SRCS+=test_sshbuf_fixed.c
# From usr.bin/ssh
SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
SRCS+=sshbuf-io.c atomicio.c misc.c xmalloc.c log.c fatal.c ssherr.c cleanup.c
+SRCS+=match.c addrmatch.c
run-regress-${PROG}: ${PROG}
env ${TEST_ENV} ./${PROG} ${UNITTEST_ARGS}