diff options
-rw-r--r-- | Makefile.in | 17 | ||||
-rw-r--r-- | regress/Makefile | 2 | ||||
-rw-r--r-- | regress/unittests/sshsig/tests.c | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index c9e4294d3..99dfdceda 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -277,6 +277,8 @@ clean: regressclean | |||
277 | rm -f regress/unittests/sshbuf/test_sshbuf$(EXEEXT) | 277 | rm -f regress/unittests/sshbuf/test_sshbuf$(EXEEXT) |
278 | rm -f regress/unittests/sshkey/*.o | 278 | rm -f regress/unittests/sshkey/*.o |
279 | rm -f regress/unittests/sshkey/test_sshkey$(EXEEXT) | 279 | rm -f regress/unittests/sshkey/test_sshkey$(EXEEXT) |
280 | rm -f regress/unittests/sshsig/*.o | ||
281 | rm -f regress/unittests/sshsig/test_sshsig$(EXEEXT) | ||
280 | rm -f regress/unittests/bitmap/*.o | 282 | rm -f regress/unittests/bitmap/*.o |
281 | rm -f regress/unittests/bitmap/test_bitmap$(EXEEXT) | 283 | rm -f regress/unittests/bitmap/test_bitmap$(EXEEXT) |
282 | rm -f regress/unittests/conversion/*.o | 284 | rm -f regress/unittests/conversion/*.o |
@@ -310,6 +312,8 @@ distclean: regressclean | |||
310 | rm -f regress/unittests/sshbuf/test_sshbuf | 312 | rm -f regress/unittests/sshbuf/test_sshbuf |
311 | rm -f regress/unittests/sshkey/*.o | 313 | rm -f regress/unittests/sshkey/*.o |
312 | rm -f regress/unittests/sshkey/test_sshkey | 314 | rm -f regress/unittests/sshkey/test_sshkey |
315 | rm -f regress/unittests/sshsig/*.o | ||
316 | rm -f regress/unittests/sshsig/test_sshsig | ||
313 | rm -f regress/unittests/bitmap/*.o | 317 | rm -f regress/unittests/bitmap/*.o |
314 | rm -f regress/unittests/bitmap/test_bitmap | 318 | rm -f regress/unittests/bitmap/test_bitmap |
315 | rm -f regress/unittests/conversion/*.o | 319 | rm -f regress/unittests/conversion/*.o |
@@ -488,6 +492,7 @@ regress-prep: | |||
488 | $(MKDIR_P) `pwd`/regress/unittests/test_helper | 492 | $(MKDIR_P) `pwd`/regress/unittests/test_helper |
489 | $(MKDIR_P) `pwd`/regress/unittests/sshbuf | 493 | $(MKDIR_P) `pwd`/regress/unittests/sshbuf |
490 | $(MKDIR_P) `pwd`/regress/unittests/sshkey | 494 | $(MKDIR_P) `pwd`/regress/unittests/sshkey |
495 | $(MKDIR_P) `pwd`/regress/unittests/sshsig | ||
491 | $(MKDIR_P) `pwd`/regress/unittests/bitmap | 496 | $(MKDIR_P) `pwd`/regress/unittests/bitmap |
492 | $(MKDIR_P) `pwd`/regress/unittests/conversion | 497 | $(MKDIR_P) `pwd`/regress/unittests/conversion |
493 | $(MKDIR_P) `pwd`/regress/unittests/hostkeys | 498 | $(MKDIR_P) `pwd`/regress/unittests/hostkeys |
@@ -559,6 +564,17 @@ regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ | |||
559 | regress/unittests/test_helper/libtest_helper.a \ | 564 | regress/unittests/test_helper/libtest_helper.a \ |
560 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 565 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
561 | 566 | ||
567 | UNITTESTS_TEST_SSHSIG_OBJS=\ | ||
568 | sshsig.o \ | ||
569 | regress/unittests/sshsig/tests.o \ | ||
570 | $(SKOBJS) | ||
571 | |||
572 | regress/unittests/sshsig/test_sshsig$(EXEEXT): ${UNITTESTS_TEST_SSHSIG_OBJS} \ | ||
573 | regress/unittests/test_helper/libtest_helper.a libssh.a | ||
574 | $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHSIG_OBJS) \ | ||
575 | regress/unittests/test_helper/libtest_helper.a \ | ||
576 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
577 | |||
562 | UNITTESTS_TEST_BITMAP_OBJS=\ | 578 | UNITTESTS_TEST_BITMAP_OBJS=\ |
563 | regress/unittests/bitmap/tests.o | 579 | regress/unittests/bitmap/tests.o |
564 | 580 | ||
@@ -655,6 +671,7 @@ regress-binaries: regress-prep $(LIBCOMPAT) \ | |||
655 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ | 671 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ |
656 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ | 672 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ |
657 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ | 673 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ |
674 | regress/unittests/sshsig/test_sshsig$(EXEEXT) \ | ||
658 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ | 675 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ |
659 | regress/unittests/conversion/test_conversion$(EXEEXT) \ | 676 | regress/unittests/conversion/test_conversion$(EXEEXT) \ |
660 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ | 677 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ |
diff --git a/regress/Makefile b/regress/Makefile index db0268fc0..8b4ed9de3 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -251,6 +251,8 @@ unit: | |||
251 | $$V ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \ | 251 | $$V ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \ |
252 | $$V ${.OBJDIR}/unittests/sshkey/test_sshkey \ | 252 | $$V ${.OBJDIR}/unittests/sshkey/test_sshkey \ |
253 | -d ${.CURDIR}/unittests/sshkey/testdata ; \ | 253 | -d ${.CURDIR}/unittests/sshkey/testdata ; \ |
254 | $$V ${.OBJDIR}/unittests/sshsig/test_sshsig \ | ||
255 | -d ${.CURDIR}/unittests/sshsig/testdata ; \ | ||
254 | $$V ${.OBJDIR}/unittests/bitmap/test_bitmap ; \ | 256 | $$V ${.OBJDIR}/unittests/bitmap/test_bitmap ; \ |
255 | $$V ${.OBJDIR}/unittests/conversion/test_conversion ; \ | 257 | $$V ${.OBJDIR}/unittests/conversion/test_conversion ; \ |
256 | $$V ${.OBJDIR}/unittests/kex/test_kex ; \ | 258 | $$V ${.OBJDIR}/unittests/kex/test_kex ; \ |
diff --git a/regress/unittests/sshsig/tests.c b/regress/unittests/sshsig/tests.c index ce59b96a2..2d69e8d49 100644 --- a/regress/unittests/sshsig/tests.c +++ b/regress/unittests/sshsig/tests.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "sshsig.h" | 25 | #include "sshsig.h" |
26 | #include "log.h" | 26 | #include "log.h" |
27 | 27 | ||
28 | #include "test_helper.h" | 28 | #include "../test_helper/test_helper.h" |
29 | 29 | ||
30 | static struct sshbuf * | 30 | static struct sshbuf * |
31 | load_file(const char *name) | 31 | load_file(const char *name) |