summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorDamien Miller <djm@google.com>2015-02-17 10:04:55 +1100
committerDamien Miller <djm@google.com>2015-02-17 10:04:55 +1100
commite89c780886b23600de1e1c8d74aabd1ff61f43f0 (patch)
tree556e4ffccf30a237a74197140e73addf946ba78d /Makefile.in
parent0abf41f99aa16ff09b263bead242d6cb2dbbcf99 (diff)
hook up hostkeys unittest to portable Makefiles
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in16
1 files changed, 16 insertions, 0 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
516UNITTESTS_TEST_HOSTKEYS_OBJS=\
517 regress/unittests/hostkeys/tests.o \
518 regress/unittests/hostkeys/test_iterate.o
519
520regress/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
512REGRESS_BINARIES=\ 527REGRESS_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
521tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) 537tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES)