summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2015-01-19 20:45:25 +0000
committerDamien Miller <djm@mindrot.org>2015-01-20 09:50:34 +1100
commitc78a578107c7e6dcf5d30a2f34cb6581bef14029 (patch)
tree4b35ae503512d33ce6fab4a04b27ef7b05e5baac /Makefile.in
parent31821d7217e686667d04935aeec99e1fc4a46e7e (diff)
upstream commit
finally enable the KEX tests I wrote some years ago...
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in19
1 files changed, 17 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index b494ac7ca..52592bbb6 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/kex/*.o
240 rm -f regress/unittests/kex/test_kex
239 (cd openbsd-compat && $(MAKE) clean) 241 (cd openbsd-compat && $(MAKE) clean)
240 242
241distclean: regressclean 243distclean: regressclean
@@ -252,6 +254,8 @@ distclean: regressclean
252 rm -f regress/unittests/sshkey/test_sshkey 254 rm -f regress/unittests/sshkey/test_sshkey
253 rm -f regress/unittests/bitmap/*.o 255 rm -f regress/unittests/bitmap/*.o
254 rm -f regress/unittests/bitmap/test_bitmap 256 rm -f regress/unittests/bitmap/test_bitmap
257 rm -f regress/unittests/kex/*.o
258 rm -f regress/unittests/kex/test_kex
255 (cd openbsd-compat && $(MAKE) distclean) 259 (cd openbsd-compat && $(MAKE) distclean)
256 if test -d pkg ; then \ 260 if test -d pkg ; then \
257 rm -fr pkg ; \ 261 rm -fr pkg ; \
@@ -488,7 +492,17 @@ regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
488UNITTESTS_TEST_BITMAP_OBJS=\ 492UNITTESTS_TEST_BITMAP_OBJS=\
489 regress/unittests/bitmap/tests.o 493 regress/unittests/bitmap/tests.o
490 494
491regress/unittests/sshkey/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \ 495regress/unittests/bitmap/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \
496 regress/unittests/test_helper/libtest_helper.a libssh.a
497 $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_BITMAP_OBJS) \
498 regress/unittests/test_helper/libtest_helper.a \
499 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
500
501UNITTESTS_TEST_BITMAP_OBJS=\
502 regress/unittests/kex/tests.o \
503 regress/unittests/kex/test_kex.o
504
505regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \
492 regress/unittests/test_helper/libtest_helper.a libssh.a 506 regress/unittests/test_helper/libtest_helper.a libssh.a
493 $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_BITMAP_OBJS) \ 507 $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_BITMAP_OBJS) \
494 regress/unittests/test_helper/libtest_helper.a \ 508 regress/unittests/test_helper/libtest_helper.a \
@@ -500,7 +514,8 @@ REGRESS_BINARIES=\
500 regress/netcat$(EXEEXT) \ 514 regress/netcat$(EXEEXT) \
501 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ 515 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
502 regress/unittests/sshkey/test_sshkey$(EXEEXT) \ 516 regress/unittests/sshkey/test_sshkey$(EXEEXT) \
503 regress/unittests/sshkey/test_bitmap$(EXEEXT) 517 regress/unittests/bitmap/test_bitmap$(EXEEXT) \
518 regress/unittests/kex/test_kex$(EXEEXT)
504 519
505tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) 520tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES)
506 BUILDDIR=`pwd`; \ 521 BUILDDIR=`pwd`; \