RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

finally enable the KEX tests I wrote some years ago...
This commit is contained in:
markus@openbsd.org 2015-01-19 20:45:25 +00:00 committed by Damien Miller
parent 31821d7217
commit c78a578107
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.in
View File

@ -236,6 +236,8 @@ clean: regressclean
rm -f regress/unittests/sshkey/test_sshkey rm -f regress/unittests/sshkey/test_sshkey
rm -f regress/unittests/bitmap/*.o rm -f regress/unittests/bitmap/*.o
rm -f regress/unittests/bitmap/test_bitmap 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) (cd openbsd-compat && $(MAKE) clean)
distclean: regressclean distclean: regressclean
@ -252,6 +254,8 @@ distclean: regressclean
rm -f regress/unittests/sshkey/test_sshkey rm -f regress/unittests/sshkey/test_sshkey
rm -f regress/unittests/bitmap/*.o rm -f regress/unittests/bitmap/*.o
rm -f regress/unittests/bitmap/test_bitmap 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) (cd openbsd-compat && $(MAKE) distclean)
if test -d pkg ; then \ if test -d pkg ; then \
rm -fr pkg ; \ rm -fr pkg ; \
@ -488,7 +492,17 @@ regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
UNITTESTS_TEST_BITMAP_OBJS=\ UNITTESTS_TEST_BITMAP_OBJS=\
regress/unittests/bitmap/tests.o 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 regress/unittests/test_helper/libtest_helper.a libssh.a
$(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_BITMAP_OBJS) \ $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_BITMAP_OBJS) \
regress/unittests/test_helper/libtest_helper.a \ regress/unittests/test_helper/libtest_helper.a \
@ -500,7 +514,8 @@ REGRESS_BINARIES=\
regress/netcat$(EXEEXT) \ regress/netcat$(EXEEXT) \
regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
regress/unittests/sshkey/test_sshkey$(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) tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES)
BUILDDIR=`pwd`; \ BUILDDIR=`pwd`; \

5
regress/unittests/Makefile
View File

@ -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> .include <bsd.subdir.mk>