diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-01-19 20:45:25 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-20 09:50:34 +1100 |
| commit | c78a578107c7e6dcf5d30a2f34cb6581bef14029 (patch) | |
| tree | 4b35ae503512d33ce6fab4a04b27ef7b05e5baac | |
| parent | 31821d7217e686667d04935aeec99e1fc4a46e7e (diff) | |
upstream commit
finally enable the KEX tests I wrote some years ago...
| -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 b494ac7c..52592bbb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -236,6 +236,8 @@ clean: regressclean rm -f regress/unittests/sshkey/test_sshkey rm -f regress/unittests/bitmap/*.o rm -f regress/unittests/bitmap/test_bitmap + rm -f regress/unittests/kex/*.o + rm -f regress/unittests/kex/test_kex (cd openbsd-compat && $(MAKE) clean) distclean: regressclean @@ -252,6 +254,8 @@ distclean: regressclean rm -f regress/unittests/sshkey/test_sshkey rm -f regress/unittests/bitmap/*.o rm -f regress/unittests/bitmap/test_bitmap + rm -f regress/unittests/kex/*.o + rm -f regress/unittests/kex/test_kex (cd openbsd-compat && $(MAKE) distclean) if test -d pkg ; then \ rm -fr pkg ; \ @@ -488,7 +492,17 @@ regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ UNITTESTS_TEST_BITMAP_OBJS=\ regress/unittests/bitmap/tests.o -regress/unittests/sshkey/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \ +regress/unittests/bitmap/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \ + regress/unittests/test_helper/libtest_helper.a libssh.a + $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_BITMAP_OBJS) \ + regress/unittests/test_helper/libtest_helper.a \ + -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) + +UNITTESTS_TEST_BITMAP_OBJS=\ + regress/unittests/kex/tests.o \ + regress/unittests/kex/test_kex.o + +regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \ regress/unittests/test_helper/libtest_helper.a libssh.a $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_BITMAP_OBJS) \ regress/unittests/test_helper/libtest_helper.a \ @@ -500,7 +514,8 @@ REGRESS_BINARIES=\ regress/netcat$(EXEEXT) \ regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ regress/unittests/sshkey/test_sshkey$(EXEEXT) \ - regress/unittests/sshkey/test_bitmap$(EXEEXT) + regress/unittests/bitmap/test_bitmap$(EXEEXT) \ + regress/unittests/kex/test_kex$(EXEEXT) tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) BUILDDIR=`pwd`; \ diff --git a/regress/unittests/Makefile b/regress/unittests/Makefile index 722940a1..98121b74 100644 --- a/regress/unittests/Makefile +++ b/regress/unittests/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2014/04/30 05:32:00 djm Exp $ +# $OpenBSD: Makefile,v 1.4 2015/01/19 20:45:25 markus Exp $ +REGRESS_FAIL_EARLY= yes -SUBDIR= test_helper sshbuf sshkey bitmap +SUBDIR= test_helper sshbuf sshkey bitmap kex .include <bsd.subdir.mk> |