From f3ca8af87a4c32ada660da12ae95cf03d190c083 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 3 Apr 2021 18:21:08 +1100 Subject: enable authopt and misc unit tests Neither were wired into the build, both required some build adaptations for -portable --- Makefile.in | 74 ++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 56 insertions(+), 18 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 15db373d..dddb2e42 100644 --- a/Makefile.in +++ b/Makefile.in @@ -272,12 +272,8 @@ clean: regressclean rm -f regress/mkdtemp$(EXEEXT) rm -f regress/unittests/test_helper/*.a rm -f regress/unittests/test_helper/*.o - rm -f regress/unittests/sshbuf/*.o - 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/authopt/*.o + rm -f regress/unittests/authopt/test_authopt$(EXEEXT) rm -f regress/unittests/bitmap/*.o rm -f regress/unittests/bitmap/test_bitmap$(EXEEXT) rm -f regress/unittests/conversion/*.o @@ -288,6 +284,14 @@ clean: regressclean rm -f regress/unittests/kex/test_kex$(EXEEXT) rm -f regress/unittests/match/*.o rm -f regress/unittests/match/test_match$(EXEEXT) + rm -f regress/unittests/misc/*.o + rm -f regress/unittests/misc/test_misc$(EXEEXT) + rm -f regress/unittests/sshbuf/*.o + 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/utf8/*.o rm -f regress/unittests/utf8/test_utf8$(EXEEXT) rm -f regress/misc/sk-dummy/*.o @@ -305,12 +309,8 @@ distclean: regressclean rm -f regress/mkdtemp rm -f regress/unittests/test_helper/*.a rm -f regress/unittests/test_helper/*.o - rm -f regress/unittests/sshbuf/*.o - 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/authopt/*.o + rm -f regress/unittests/authopt/test_authopt rm -f regress/unittests/bitmap/*.o rm -f regress/unittests/bitmap/test_bitmap rm -f regress/unittests/conversion/*.o @@ -321,6 +321,14 @@ distclean: regressclean rm -f regress/unittests/kex/test_kex rm -f regress/unittests/match/*.o rm -f regress/unittests/match/test_match + rm -f regress/unittests/misc/*.o + rm -f regress/unittests/misc/test_misc + rm -f regress/unittests/sshbuf/*.o + 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/utf8/*.o rm -f regress/unittests/utf8/test_utf8 (cd openbsd-compat && $(MAKE) distclean) @@ -485,14 +493,16 @@ uninstall: 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/authopt $(MKDIR_P) `pwd`/regress/unittests/bitmap $(MKDIR_P) `pwd`/regress/unittests/conversion $(MKDIR_P) `pwd`/regress/unittests/hostkeys $(MKDIR_P) `pwd`/regress/unittests/kex $(MKDIR_P) `pwd`/regress/unittests/match + $(MKDIR_P) `pwd`/regress/unittests/misc + $(MKDIR_P) `pwd`/regress/unittests/sshbuf + $(MKDIR_P) `pwd`/regress/unittests/sshkey + $(MKDIR_P) `pwd`/regress/unittests/sshsig $(MKDIR_P) `pwd`/regress/unittests/utf8 $(MKDIR_P) `pwd`/regress/misc/sk-dummy [ -f `pwd`/regress/Makefile ] || \ @@ -578,6 +588,18 @@ 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_AUTHOPT_OBJS=\ + regress/unittests/authopt/tests.o \ + auth-options.o \ + $(SKOBJS) + +regress/unittests/authopt/test_authopt$(EXEEXT): \ + ${UNITTESTS_TEST_AUTHOPT_OBJS} \ + regress/unittests/test_helper/libtest_helper.a libssh.a + $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_AUTHOPT_OBJS) \ + regress/unittests/test_helper/libtest_helper.a \ + -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) + UNITTESTS_TEST_CONVERSION_OBJS=\ regress/unittests/conversion/tests.o @@ -621,6 +643,20 @@ regress/unittests/match/test_match$(EXEEXT): \ regress/unittests/test_helper/libtest_helper.a \ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) +UNITTESTS_TEST_MISC_OBJS=\ + regress/unittests/misc/tests.o \ + regress/unittests/misc/test_parse.o \ + regress/unittests/misc/test_expand.o \ + regress/unittests/misc/test_convtime.o \ + regress/unittests/misc/test_argv.o + +regress/unittests/misc/test_misc$(EXEEXT): \ + ${UNITTESTS_TEST_MISC_OBJS} \ + regress/unittests/test_helper/libtest_helper.a libssh.a + $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_MISC_OBJS) \ + regress/unittests/test_helper/libtest_helper.a \ + -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) + UNITTESTS_TEST_UTF8_OBJS=\ regress/unittests/utf8/tests.o @@ -655,14 +691,16 @@ regress-binaries: regress-prep $(LIBCOMPAT) \ $(SK_DUMMY_LIBRARY) 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/authopt/test_authopt$(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) \ + regress/unittests/misc/test_misc$(EXEEXT) \ + regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ + regress/unittests/sshkey/test_sshkey$(EXEEXT) \ + regress/unittests/sshsig/test_sshsig$(EXEEXT) \ regress/unittests/utf8/test_utf8$(EXEEXT) \ tests: file-tests t-exec interop-tests unit -- cgit v1.2.1