diff options
author | Darren Tucker <dtucker@zip.com.au> | 2017-03-14 14:19:36 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2017-03-14 14:19:36 +1100 |
commit | b1b22dd0df2668b322dda174e501dccba2cf5c44 (patch) | |
tree | 3a72816f92eb26deb35a882424c471980c238b42 | |
parent | f57783f1ddfb4cdfbd612c6beb5ec01cb5b9a6b9 (diff) |
Plumb conversion test into makefile.
-rw-r--r-- | Makefile.in | 17 | ||||
-rw-r--r-- | regress/Makefile | 1 | ||||
-rw-r--r-- | regress/unittests/conversion/tests.c | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index e1a6aa218..5870e9e6e 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -236,6 +236,8 @@ clean: regressclean | |||
236 | rm -f regress/unittests/sshkey/test_sshkey | 236 | rm -f regress/unittests/sshkey/test_sshkey |
237 | rm -f regress/unittests/bitmap/*.o | 237 | rm -f regress/unittests/bitmap/*.o |
238 | rm -f regress/unittests/bitmap/test_bitmap | 238 | rm -f regress/unittests/bitmap/test_bitmap |
239 | rm -f regress/unittests/conversion/*.o | ||
240 | rm -f regress/unittests/conversion/test_conversion | ||
239 | rm -f regress/unittests/hostkeys/*.o | 241 | rm -f regress/unittests/hostkeys/*.o |
240 | rm -f regress/unittests/hostkeys/test_hostkeys | 242 | rm -f regress/unittests/hostkeys/test_hostkeys |
241 | rm -f regress/unittests/kex/*.o | 243 | rm -f regress/unittests/kex/*.o |
@@ -262,6 +264,8 @@ distclean: regressclean | |||
262 | rm -f regress/unittests/sshkey/test_sshkey | 264 | rm -f regress/unittests/sshkey/test_sshkey |
263 | rm -f regress/unittests/bitmap/*.o | 265 | rm -f regress/unittests/bitmap/*.o |
264 | rm -f regress/unittests/bitmap/test_bitmap | 266 | rm -f regress/unittests/bitmap/test_bitmap |
267 | rm -f regress/unittests/conversion/*.o | ||
268 | rm -f regress/unittests/conversion/test_conversion | ||
265 | rm -f regress/unittests/hostkeys/*.o | 269 | rm -f regress/unittests/hostkeys/*.o |
266 | rm -f regress/unittests/hostkeys/test_hostkeys | 270 | rm -f regress/unittests/hostkeys/test_hostkeys |
267 | rm -f regress/unittests/kex/*.o | 271 | rm -f regress/unittests/kex/*.o |
@@ -426,6 +430,8 @@ regress-prep: | |||
426 | mkdir -p `pwd`/regress/unittests/sshkey | 430 | mkdir -p `pwd`/regress/unittests/sshkey |
427 | [ -d `pwd`/regress/unittests/bitmap ] || \ | 431 | [ -d `pwd`/regress/unittests/bitmap ] || \ |
428 | mkdir -p `pwd`/regress/unittests/bitmap | 432 | mkdir -p `pwd`/regress/unittests/bitmap |
433 | [ -d `pwd`/regress/unittests/conversion ] || \ | ||
434 | mkdir -p `pwd`/regress/unittests/conversion | ||
429 | [ -d `pwd`/regress/unittests/hostkeys ] || \ | 435 | [ -d `pwd`/regress/unittests/hostkeys ] || \ |
430 | mkdir -p `pwd`/regress/unittests/hostkeys | 436 | mkdir -p `pwd`/regress/unittests/hostkeys |
431 | [ -d `pwd`/regress/unittests/kex ] || \ | 437 | [ -d `pwd`/regress/unittests/kex ] || \ |
@@ -503,6 +509,16 @@ regress/unittests/bitmap/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \ | |||
503 | regress/unittests/test_helper/libtest_helper.a \ | 509 | regress/unittests/test_helper/libtest_helper.a \ |
504 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 510 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
505 | 511 | ||
512 | UNITTESTS_TEST_CONVERSION_OBJS=\ | ||
513 | regress/unittests/conversion/tests.o | ||
514 | |||
515 | regress/unittests/conversion/test_conversion$(EXEEXT): \ | ||
516 | ${UNITTESTS_TEST_CONVERSION_OBJS} \ | ||
517 | regress/unittests/test_helper/libtest_helper.a libssh.a | ||
518 | $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_CONVERSION_OBJS) \ | ||
519 | regress/unittests/test_helper/libtest_helper.a \ | ||
520 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
521 | |||
506 | UNITTESTS_TEST_KEX_OBJS=\ | 522 | UNITTESTS_TEST_KEX_OBJS=\ |
507 | regress/unittests/kex/tests.o \ | 523 | regress/unittests/kex/tests.o \ |
508 | regress/unittests/kex/test_kex.o | 524 | regress/unittests/kex/test_kex.o |
@@ -558,6 +574,7 @@ regress-binaries: regress/modpipe$(EXEEXT) \ | |||
558 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ | 574 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ |
559 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ | 575 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ |
560 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ | 576 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ |
577 | regress/unittests/conversion/test_conversion$(EXEEXT) \ | ||
561 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ | 578 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ |
562 | regress/unittests/kex/test_kex$(EXEEXT) \ | 579 | regress/unittests/kex/test_kex$(EXEEXT) \ |
563 | regress/unittests/match/test_match$(EXEEXT) \ | 580 | regress/unittests/match/test_match$(EXEEXT) \ |
diff --git a/regress/Makefile b/regress/Makefile index c2dba4fdf..b23496b98 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -222,6 +222,7 @@ unit: | |||
222 | $$V ${.OBJDIR}/unittests/sshkey/test_sshkey \ | 222 | $$V ${.OBJDIR}/unittests/sshkey/test_sshkey \ |
223 | -d ${.CURDIR}/unittests/sshkey/testdata ; \ | 223 | -d ${.CURDIR}/unittests/sshkey/testdata ; \ |
224 | $$V ${.OBJDIR}/unittests/bitmap/test_bitmap ; \ | 224 | $$V ${.OBJDIR}/unittests/bitmap/test_bitmap ; \ |
225 | $$V ${.OBJDIR}/unittests/conversion/test_conversion ; \ | ||
225 | $$V ${.OBJDIR}/unittests/kex/test_kex ; \ | 226 | $$V ${.OBJDIR}/unittests/kex/test_kex ; \ |
226 | $$V ${.OBJDIR}/unittests/hostkeys/test_hostkeys \ | 227 | $$V ${.OBJDIR}/unittests/hostkeys/test_hostkeys \ |
227 | -d ${.CURDIR}/unittests/hostkeys/testdata ; \ | 228 | -d ${.CURDIR}/unittests/hostkeys/testdata ; \ |
diff --git a/regress/unittests/conversion/tests.c b/regress/unittests/conversion/tests.c index ebd7bde00..eaa96bb25 100644 --- a/regress/unittests/conversion/tests.c +++ b/regress/unittests/conversion/tests.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <stdlib.h> | 12 | #include <stdlib.h> |
13 | #include <string.h> | 13 | #include <string.h> |
14 | 14 | ||
15 | #include "test_helper.h" | 15 | #include "../test_helper/test_helper.h" |
16 | 16 | ||
17 | #include "misc.h" | 17 | #include "misc.h" |
18 | 18 | ||