diff options
-rw-r--r-- | Makefile.in | 19 | ||||
-rw-r--r-- | regress/unittests/Makefile | 5 |
2 files changed, 20 insertions, 4 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 | ||
241 | distclean: regressclean | 243 | distclean: 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} \ | |||
488 | UNITTESTS_TEST_BITMAP_OBJS=\ | 492 | UNITTESTS_TEST_BITMAP_OBJS=\ |
489 | regress/unittests/bitmap/tests.o | 493 | regress/unittests/bitmap/tests.o |
490 | 494 | ||
491 | regress/unittests/sshkey/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \ | 495 | regress/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 | |||
501 | UNITTESTS_TEST_BITMAP_OBJS=\ | ||
502 | regress/unittests/kex/tests.o \ | ||
503 | regress/unittests/kex/test_kex.o | ||
504 | |||
505 | regress/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 | ||
505 | tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) | 520 | tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) |
506 | BUILDDIR=`pwd`; \ | 521 | BUILDDIR=`pwd`; \ |
diff --git a/regress/unittests/Makefile b/regress/unittests/Makefile index 722940a1b..98121b744 100644 --- a/regress/unittests/Makefile +++ b/regress/unittests/Makefile | |||
@@ -1,5 +1,6 @@ | |||
1 | # $OpenBSD: Makefile,v 1.1 2014/04/30 05:32:00 djm Exp $ | 1 | # $OpenBSD: Makefile,v 1.4 2015/01/19 20:45:25 markus Exp $ |
2 | REGRESS_FAIL_EARLY= yes | ||
2 | 3 | ||
3 | SUBDIR= test_helper sshbuf sshkey bitmap | 4 | SUBDIR= test_helper sshbuf sshkey bitmap kex |
4 | 5 | ||
5 | .include <bsd.subdir.mk> | 6 | .include <bsd.subdir.mk> |