tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hook up hostkeys unittest to portable Makefiles

This commit is contained in:
Damien Miller 2015-02-17 10:04:55 +11:00
parent 0abf41f99a
commit e89c780886
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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/hostkeys/*.o
rm -f regress/unittests/hostkeys/test_hostkeys
rm -f regress/unittests/kex/*.o rm -f regress/unittests/kex/*.o
rm -f regress/unittests/kex/test_kex rm -f regress/unittests/kex/test_kex
(cd openbsd-compat && $(MAKE) clean) (cd openbsd-compat && $(MAKE) clean)
@ -254,6 +256,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/hostkeys/*.o
rm -f regress/unittests/hostkeys/test_hostkeys
rm -f regress/unittests/kex/*.o rm -f regress/unittests/kex/*.o
rm -f regress/unittests/kex/test_kex rm -f regress/unittests/kex/test_kex
(cd openbsd-compat && $(MAKE) distclean) (cd openbsd-compat && $(MAKE) distclean)
@ -509,6 +513,17 @@ regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \
regress/unittests/test_helper/libtest_helper.a \ regress/unittests/test_helper/libtest_helper.a \
-lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
UNITTESTS_TEST_HOSTKEYS_OBJS=\
regress/unittests/hostkeys/tests.o \
regress/unittests/hostkeys/test_iterate.o
regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \
${UNITTESTS_TEST_HOSTKEYS_OBJS} \
regress/unittests/test_helper/libtest_helper.a libssh.a
$(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_HOSTKEYS_OBJS) \
regress/unittests/test_helper/libtest_helper.a \
-lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
REGRESS_BINARIES=\ REGRESS_BINARIES=\
regress/modpipe$(EXEEXT) \ regress/modpipe$(EXEEXT) \
regress/setuid-allowed$(EXEEXT) \ regress/setuid-allowed$(EXEEXT) \
@ -516,6 +531,7 @@ REGRESS_BINARIES=\
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/bitmap/test_bitmap$(EXEEXT) \ regress/unittests/bitmap/test_bitmap$(EXEEXT) \
regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \
regress/unittests/kex/test_kex$(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)

4
regress/Makefile
View File

@ -205,7 +205,9 @@ unit:
set -e ; if test -z "${SKIP_UNIT}" ; then \ set -e ; if test -z "${SKIP_UNIT}" ; then \
${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \ ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \
${.OBJDIR}/unittests/sshkey/test_sshkey \ ${.OBJDIR}/unittests/sshkey/test_sshkey \
-d ${.CURDIR}//unittests/sshkey/testdata ; \ -d ${.CURDIR}/unittests/sshkey/testdata ; \
${.OBJDIR}/unittests/bitmap/test_bitmap ; \ ${.OBJDIR}/unittests/bitmap/test_bitmap ; \
${.OBJDIR}/unittests/kex/test_kex ; \ ${.OBJDIR}/unittests/kex/test_kex ; \
${.OBJDIR}/unittests/hostkeys/test_hostkeys \
-d ${.CURDIR}/unittests/hostkeys/testdata ; \
fi fi

2
regress/unittests/hostkeys/test_iterate.c
View File

@ -12,7 +12,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "test_helper.h" #include "../test_helper/test_helper.h"
#include "sshkey.h" #include "sshkey.h"
#include "authfile.h" #include "authfile.h"