diff options
| author | Damien Miller <djm@mindrot.org> | 2021-04-03 18:21:08 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-04-03 18:21:08 +1100 |
| commit | f3ca8af87a4c32ada660da12ae95cf03d190c083 (patch) | |
| tree | a29dbc240af3dc5c77119c9dd6691e2d8963a3b6 /regress | |
| parent | dc1b45841fb97e3d7f655ddbcfef3839735cae5f (diff) | |
| download | openssh-git-f3ca8af87a4c32ada660da12ae95cf03d190c083.tar.gz | |
enable authopt and misc unit tests
Neither were wired into the build, both required some build
adaptations for -portable
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/Makefile | 7 | ||||
| -rw-r--r-- | regress/unittests/authopt/tests.c | 4 | ||||
| -rw-r--r-- | regress/unittests/misc/test_argv.c | 4 | ||||
| -rw-r--r-- | regress/unittests/misc/test_convtime.c | 4 | ||||
| -rw-r--r-- | regress/unittests/misc/test_expand.c | 4 | ||||
| -rw-r--r-- | regress/unittests/misc/test_parse.c | 4 | ||||
| -rw-r--r-- | regress/unittests/misc/tests.c | 4 |
7 files changed, 23 insertions, 8 deletions
diff --git a/regress/Makefile b/regress/Makefile index 43da7c7d..ced21a11 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -249,17 +249,20 @@ unit: V="" ; \ test "x${USE_VALGRIND}" = "x" || \ V=${.CURDIR}/valgrind-unit.sh ; \ - $$V ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \ - $$V ${.OBJDIR}/unittests/sshkey/test_sshkey \ + $$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/authopt/test_authopt \ + -d ${.CURDIR}/unittests/authopt/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 ; \ $$V ${.OBJDIR}/unittests/match/test_match ; \ + $$V ${.OBJDIR}/unittests/misc/test_misc ; \ if test "x${TEST_SSH_UTF8}" = "xyes" ; then \ $$V ${.OBJDIR}/unittests/utf8/test_utf8 ; \ fi \ diff --git a/regress/unittests/authopt/tests.c b/regress/unittests/authopt/tests.c index 0e8aacb9..8c51b380 100644 --- a/regress/unittests/authopt/tests.c +++ b/regress/unittests/authopt/tests.c @@ -6,6 +6,8 @@ * Placed in the public domain */ +#include "includes.h" + #include <sys/types.h> #include <sys/param.h> #include <stdio.h> @@ -13,7 +15,7 @@ #include <stdlib.h> #include <string.h> -#include "test_helper.h" +#include "../test_helper/test_helper.h" #include "sshkey.h" #include "authfile.h" diff --git a/regress/unittests/misc/test_argv.c b/regress/unittests/misc/test_argv.c index 0ce86694..7a28f64e 100644 --- a/regress/unittests/misc/test_argv.c +++ b/regress/unittests/misc/test_argv.c @@ -5,6 +5,8 @@ * Placed in the public domain. */ +#include "includes.h" + #include <sys/types.h> #include <sys/param.h> #include <stdio.h> @@ -12,7 +14,7 @@ #include <stdlib.h> #include <string.h> -#include "test_helper.h" +#include "../test_helper/test_helper.h" #include "log.h" #include "misc.h" diff --git a/regress/unittests/misc/test_convtime.c b/regress/unittests/misc/test_convtime.c index 8da05a26..5be3ee43 100644 --- a/regress/unittests/misc/test_convtime.c +++ b/regress/unittests/misc/test_convtime.c @@ -5,6 +5,8 @@ * Placed in the public domain. */ +#include "includes.h" + #include <sys/types.h> #include <sys/param.h> #include <stdio.h> @@ -12,7 +14,7 @@ #include <stdlib.h> #include <string.h> -#include "test_helper.h" +#include "../test_helper/test_helper.h" #include "log.h" #include "misc.h" diff --git a/regress/unittests/misc/test_expand.c b/regress/unittests/misc/test_expand.c index 2a5e1bf1..3cfe0e71 100644 --- a/regress/unittests/misc/test_expand.c +++ b/regress/unittests/misc/test_expand.c @@ -5,6 +5,8 @@ * Placed in the public domain. */ +#include "includes.h" + #include <sys/types.h> #include <sys/param.h> #include <stdio.h> @@ -12,7 +14,7 @@ #include <stdlib.h> #include <string.h> -#include "test_helper.h" +#include "../test_helper/test_helper.h" #include "log.h" #include "misc.h" diff --git a/regress/unittests/misc/test_parse.c b/regress/unittests/misc/test_parse.c index 6fa4558e..dd99068d 100644 --- a/regress/unittests/misc/test_parse.c +++ b/regress/unittests/misc/test_parse.c @@ -5,6 +5,8 @@ * Placed in the public domain. */ +#include "includes.h" + #include <sys/types.h> #include <sys/param.h> #include <stdio.h> @@ -12,7 +14,7 @@ #include <stdlib.h> #include <string.h> -#include "test_helper.h" +#include "../test_helper/test_helper.h" #include "log.h" #include "misc.h" diff --git a/regress/unittests/misc/tests.c b/regress/unittests/misc/tests.c index fe9544a9..75013f48 100644 --- a/regress/unittests/misc/tests.c +++ b/regress/unittests/misc/tests.c @@ -5,6 +5,8 @@ * Placed in the public domain. */ +#include "includes.h" + #include <sys/types.h> #include <sys/param.h> #include <stdio.h> @@ -12,7 +14,7 @@ #include <stdlib.h> #include <string.h> -#include "test_helper.h" +#include "../test_helper/test_helper.h" #include "log.h" #include "misc.h" |