Plumb conversion test into makefile.

diff --git a/Makefile.in b/Makefile.in
index e1a6aa21882fcf99debc7731dd98cc325b781be6..5870e9e6e6b95b885bfcb6e68b5c8ae272869387 100644 (file)
--- 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/conversion/*.o
+       rm -f regress/unittests/conversion/test_conversion
        rm -f regress/unittests/hostkeys/*.o
        rm -f regress/unittests/hostkeys/test_hostkeys
        rm -f regress/unittests/kex/*.o
@@ -262,6 +264,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/conversion/*.o
+       rm -f regress/unittests/conversion/test_conversion
        rm -f regress/unittests/hostkeys/*.o
        rm -f regress/unittests/hostkeys/test_hostkeys
        rm -f regress/unittests/kex/*.o
@@ -426,6 +430,8 @@ regress-prep:
                mkdir -p `pwd`/regress/unittests/sshkey
        [ -d `pwd`/regress/unittests/bitmap ] || \
                mkdir -p `pwd`/regress/unittests/bitmap
+       [ -d `pwd`/regress/unittests/conversion ] || \
+               mkdir -p `pwd`/regress/unittests/conversion
        [ -d `pwd`/regress/unittests/hostkeys ] || \
                mkdir -p `pwd`/regress/unittests/hostkeys
        [ -d `pwd`/regress/unittests/kex ] || \
@@ -503,6 +509,16 @@ regress/unittests/bitmap/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \
            regress/unittests/test_helper/libtest_helper.a \
            -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
+UNITTESTS_TEST_CONVERSION_OBJS=\
+       regress/unittests/conversion/tests.o
+
+regress/unittests/conversion/test_conversion$(EXEEXT): \
+    ${UNITTESTS_TEST_CONVERSION_OBJS} \
+    regress/unittests/test_helper/libtest_helper.a libssh.a
+       $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_CONVERSION_OBJS) \
+           regress/unittests/test_helper/libtest_helper.a \
+           -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+
 UNITTESTS_TEST_KEX_OBJS=\
        regress/unittests/kex/tests.o \
        regress/unittests/kex/test_kex.o
@@ -558,6 +574,7 @@ regress-binaries: regress/modpipe$(EXEEXT) \
        regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
        regress/unittests/sshkey/test_sshkey$(EXEEXT) \
        regress/unittests/bitmap/test_bitmap$(EXEEXT) \
+       regress/unittests/conversion/test_conversion$(EXEEXT) \
        regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \
        regress/unittests/kex/test_kex$(EXEEXT) \
        regress/unittests/match/test_match$(EXEEXT) \

diff --git a/regress/Makefile b/regress/Makefile
index c2dba4fdf5eaa87b99e95553b3479a11bcab672a..b23496b984171ce86fae303a767f2a5314332982 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -222,6 +222,7 @@ unit:
                $$V ${.OBJDIR}/unittests/sshkey/test_sshkey \
                        -d ${.CURDIR}/unittests/sshkey/testdata ; \
                $$V ${.OBJDIR}/unittests/bitmap/test_bitmap ; \
+               $$V ${.OBJDIR}/unittests/conversion/test_conversion ; \
                $$V ${.OBJDIR}/unittests/kex/test_kex ; \
                $$V ${.OBJDIR}/unittests/hostkeys/test_hostkeys \
                        -d ${.CURDIR}/unittests/hostkeys/testdata ; \

diff --git a/regress/unittests/conversion/tests.c b/regress/unittests/conversion/tests.c
index ebd7bde0049e2afd31961a91742dfcd7c15cc802..eaa96bb25eaeea466639115c02e9a85c355a2ecf 100644 (file)
--- a/regress/unittests/conversion/tests.c
+++ b/regress/unittests/conversion/tests.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "test_helper.h"
+#include "../test_helper/test_helper.h"
 
 #include "misc.h"