diff options
-rw-r--r-- | Makefile.in | 16 | ||||
-rw-r--r-- | regress/Makefile | 4 | ||||
-rw-r--r-- | regress/unittests/hostkeys/test_iterate.c | 2 |
3 files changed, 20 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 5119d6a30..c8783156e 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -236,6 +236,8 @@ clean: regressclean | |||
236 | rm -f regress/unittests/sshkey/test_sshkey | 236 | rm -f regress/unittests/sshkey/test_sshkey |
237 | rm -f regress/unittests/bitmap/*.o | 237 | rm -f regress/unittests/bitmap/*.o |
238 | rm -f regress/unittests/bitmap/test_bitmap | 238 | rm -f regress/unittests/bitmap/test_bitmap |
239 | rm -f regress/unittests/hostkeys/*.o | ||
240 | rm -f regress/unittests/hostkeys/test_hostkeys | ||
239 | rm -f regress/unittests/kex/*.o | 241 | rm -f regress/unittests/kex/*.o |
240 | rm -f regress/unittests/kex/test_kex | 242 | rm -f regress/unittests/kex/test_kex |
241 | (cd openbsd-compat && $(MAKE) clean) | 243 | (cd openbsd-compat && $(MAKE) clean) |
@@ -254,6 +256,8 @@ distclean: regressclean | |||
254 | rm -f regress/unittests/sshkey/test_sshkey | 256 | rm -f regress/unittests/sshkey/test_sshkey |
255 | rm -f regress/unittests/bitmap/*.o | 257 | rm -f regress/unittests/bitmap/*.o |
256 | rm -f regress/unittests/bitmap/test_bitmap | 258 | rm -f regress/unittests/bitmap/test_bitmap |
259 | rm -f regress/unittests/hostkeys/*.o | ||
260 | rm -f regress/unittests/hostkeys/test_hostkeys | ||
257 | rm -f regress/unittests/kex/*.o | 261 | rm -f regress/unittests/kex/*.o |
258 | rm -f regress/unittests/kex/test_kex | 262 | rm -f regress/unittests/kex/test_kex |
259 | (cd openbsd-compat && $(MAKE) distclean) | 263 | (cd openbsd-compat && $(MAKE) distclean) |
@@ -509,6 +513,17 @@ regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \ | |||
509 | regress/unittests/test_helper/libtest_helper.a \ | 513 | regress/unittests/test_helper/libtest_helper.a \ |
510 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 514 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
511 | 515 | ||
516 | UNITTESTS_TEST_HOSTKEYS_OBJS=\ | ||
517 | regress/unittests/hostkeys/tests.o \ | ||
518 | regress/unittests/hostkeys/test_iterate.o | ||
519 | |||
520 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ | ||
521 | ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ | ||
522 | regress/unittests/test_helper/libtest_helper.a libssh.a | ||
523 | $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_HOSTKEYS_OBJS) \ | ||
524 | regress/unittests/test_helper/libtest_helper.a \ | ||
525 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
526 | |||
512 | REGRESS_BINARIES=\ | 527 | REGRESS_BINARIES=\ |
513 | regress/modpipe$(EXEEXT) \ | 528 | regress/modpipe$(EXEEXT) \ |
514 | regress/setuid-allowed$(EXEEXT) \ | 529 | regress/setuid-allowed$(EXEEXT) \ |
@@ -516,6 +531,7 @@ REGRESS_BINARIES=\ | |||
516 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ | 531 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ |
517 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ | 532 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ |
518 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ | 533 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ |
534 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ | ||
519 | regress/unittests/kex/test_kex$(EXEEXT) | 535 | regress/unittests/kex/test_kex$(EXEEXT) |
520 | 536 | ||
521 | tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) | 537 | tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) |
diff --git a/regress/Makefile b/regress/Makefile index b30a7133b..a5eaa0997 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -205,7 +205,9 @@ unit: | |||
205 | set -e ; if test -z "${SKIP_UNIT}" ; then \ | 205 | set -e ; if test -z "${SKIP_UNIT}" ; then \ |
206 | ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \ | 206 | ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \ |
207 | ${.OBJDIR}/unittests/sshkey/test_sshkey \ | 207 | ${.OBJDIR}/unittests/sshkey/test_sshkey \ |
208 | -d ${.CURDIR}//unittests/sshkey/testdata ; \ | 208 | -d ${.CURDIR}/unittests/sshkey/testdata ; \ |
209 | ${.OBJDIR}/unittests/bitmap/test_bitmap ; \ | 209 | ${.OBJDIR}/unittests/bitmap/test_bitmap ; \ |
210 | ${.OBJDIR}/unittests/kex/test_kex ; \ | 210 | ${.OBJDIR}/unittests/kex/test_kex ; \ |
211 | ${.OBJDIR}/unittests/hostkeys/test_hostkeys \ | ||
212 | -d ${.CURDIR}/unittests/hostkeys/testdata ; \ | ||
211 | fi | 213 | fi |
diff --git a/regress/unittests/hostkeys/test_iterate.c b/regress/unittests/hostkeys/test_iterate.c index 92d3a8345..c681f19f3 100644 --- a/regress/unittests/hostkeys/test_iterate.c +++ b/regress/unittests/hostkeys/test_iterate.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <stdlib.h> | 12 | #include <stdlib.h> |
13 | #include <string.h> | 13 | #include <string.h> |
14 | 14 | ||
15 | #include "test_helper.h" | 15 | #include "../test_helper/test_helper.h" |
16 | 16 | ||
17 | #include "sshkey.h" | 17 | #include "sshkey.h" |
18 | #include "authfile.h" | 18 | #include "authfile.h" |