Hook sshsig tests up to Portable Makefiles.

diff --git a/Makefile.in b/Makefile.in
index c9e4294d3cfb13ee8ad9525c21564f98fdccd7d4..99dfdceda9cc3f48c3d1dced4adbe05ba0431bb3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,6 +277,8 @@ clean:      regressclean
        rm -f regress/unittests/sshbuf/test_sshbuf$(EXEEXT)
        rm -f regress/unittests/sshkey/*.o
        rm -f regress/unittests/sshkey/test_sshkey$(EXEEXT)
+       rm -f regress/unittests/sshsig/*.o
+       rm -f regress/unittests/sshsig/test_sshsig$(EXEEXT)
        rm -f regress/unittests/bitmap/*.o
        rm -f regress/unittests/bitmap/test_bitmap$(EXEEXT)
        rm -f regress/unittests/conversion/*.o
@@ -310,6 +312,8 @@ distclean:  regressclean
        rm -f regress/unittests/sshbuf/test_sshbuf
        rm -f regress/unittests/sshkey/*.o
        rm -f regress/unittests/sshkey/test_sshkey
+       rm -f regress/unittests/sshsig/*.o
+       rm -f regress/unittests/sshsig/test_sshsig
        rm -f regress/unittests/bitmap/*.o
        rm -f regress/unittests/bitmap/test_bitmap
        rm -f regress/unittests/conversion/*.o
@@ -488,6 +492,7 @@ regress-prep:
        $(MKDIR_P) `pwd`/regress/unittests/test_helper
        $(MKDIR_P) `pwd`/regress/unittests/sshbuf
        $(MKDIR_P) `pwd`/regress/unittests/sshkey
+       $(MKDIR_P) `pwd`/regress/unittests/sshsig
        $(MKDIR_P) `pwd`/regress/unittests/bitmap
        $(MKDIR_P) `pwd`/regress/unittests/conversion
        $(MKDIR_P) `pwd`/regress/unittests/hostkeys
@@ -559,6 +564,17 @@ regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
            regress/unittests/test_helper/libtest_helper.a \
            -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
+UNITTESTS_TEST_SSHSIG_OBJS=\
+       sshsig.o \
+       regress/unittests/sshsig/tests.o \
+       $(SKOBJS)
+
+regress/unittests/sshsig/test_sshsig$(EXEEXT): ${UNITTESTS_TEST_SSHSIG_OBJS} \
+    regress/unittests/test_helper/libtest_helper.a libssh.a
+       $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHSIG_OBJS) \
+           regress/unittests/test_helper/libtest_helper.a \
+           -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+
 UNITTESTS_TEST_BITMAP_OBJS=\
        regress/unittests/bitmap/tests.o
 
@@ -655,6 +671,7 @@ regress-binaries: regress-prep $(LIBCOMPAT) \
 regress-unit-binaries: regress-prep $(REGRESSLIBS) \
        regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
        regress/unittests/sshkey/test_sshkey$(EXEEXT) \
+       regress/unittests/sshsig/test_sshsig$(EXEEXT) \
        regress/unittests/bitmap/test_bitmap$(EXEEXT) \
        regress/unittests/conversion/test_conversion$(EXEEXT) \
        regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \

diff --git a/regress/Makefile b/regress/Makefile
index db0268fc07a16f38dfe02739050abd2ed752fac0..8b4ed9de398ae052ef9379ff41abbee78529bdf4 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -251,6 +251,8 @@ unit:
                $$V ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \
                $$V ${.OBJDIR}/unittests/sshkey/test_sshkey \
                        -d ${.CURDIR}/unittests/sshkey/testdata ; \
+               $$V ${.OBJDIR}/unittests/sshsig/test_sshsig \
+                       -d ${.CURDIR}/unittests/sshsig/testdata ; \
                $$V ${.OBJDIR}/unittests/bitmap/test_bitmap ; \
                $$V ${.OBJDIR}/unittests/conversion/test_conversion ; \
                $$V ${.OBJDIR}/unittests/kex/test_kex ; \

diff --git a/regress/unittests/sshsig/tests.c b/regress/unittests/sshsig/tests.c
index ce59b96a2e005ea5441f1d30d0cd1b9ffb565e9b..2d69e8d49f1447bdcdd1c8f877dd85453bb8febb 100644 (file)
--- a/regress/unittests/sshsig/tests.c
+++ b/regress/unittests/sshsig/tests.c
@@ -25,7 +25,7 @@
 #include "sshsig.h"
 #include "log.h"
 
-#include "test_helper.h"
+#include "../test_helper/test_helper.h"
 
 static struct sshbuf *
 load_file(const char *name)