GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 00:37:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Separate root from docker tests

Browse Source 
This allows running the root tests under CI, even if the
docker tests (which cannot be run) are not.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos
2017-09-09 11:08:23 +02:00
parent 9ded09293e
commit b5d77da7f4
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -100,6 +100,13 @@ AC_ARG_WITH(root-tests,
AM_CONDITIONAL(ENABLE_ROOT_TESTS, test "x$root_tests" = xyes)
AC_ARG_WITH(docker-tests,
AS_HELP_STRING([--without-docker-tests], [disable any tests requiring docker]),
docker_tests=$withval,
docker_tests=yes)
AM_CONDITIONAL(ENABLE_DOCKER_TESTS, test "x$docker_tests" = xyes)
AC_ARG_WITH(local-talloc,
AS_HELP_STRING([--with-local-talloc], [use the included talloc library]),
no_test_for_talloc=$withval,

2
tests/Makefile.am
View File

@@ -33,10 +33,12 @@ dist_check_SCRIPTS += server-cert-ed25519 server-cert-rsa-pss
endif
if ENABLE_ROOT_TESTS
if ENABLE_DOCKER_TESTS
#docker tests
dist_check_SCRIPTS += radius-test full-test unix-test kerberos-test radius-test-config \
proxyproto-test proxyproto-v1-test proxyproto-unix-test otp-test \
reload-info-test radius-group-test
endif
#other root requiring tests
dist_check_SCRIPTS += test-iroute test-multi-cookie test-pass-script test-pass-opt-cert \