mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-04 07:55:18 +00:00
Code Issues Releases Wiki Activity

[master] Disable lettuce tests for resolver when the resolver is not available

Browse Source 
Also fix configure argument name to match help documentation.
This commit is contained in:
Mukund Sivaraman
2013-08-14 16:04:41 +05:30
parent 95e7d858ad
commit 2fbb93f713
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -899,11 +899,17 @@ if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$werror_ok" = X1 -a $CLANGP
fi fi
build_experimental_resolver=no build_experimental_resolver=no
AC_ARG_ENABLE(experimental_resolver, AC_ARG_ENABLE(experimental-resolver,
[AC_HELP_STRING([--enable-experimental-resolver], [AC_HELP_STRING([--enable-experimental-resolver],
[enable building of the experimental resolver [default=no]])], [enable building of the experimental resolver [default=no]])],
build_experimental_resolver=$enableval, build_experimental_resolver=no) [build_experimental_resolver=$enableval])
AM_CONDITIONAL([BUILD_EXPERIMENTAL_RESOLVER], [test "$build_experimental_resolver" = "yes"]) AM_CONDITIONAL([BUILD_EXPERIMENTAL_RESOLVER], [test "$build_experimental_resolver" = "yes"])
if test "$build_experimental_resolver" = "yes"; then
BUILD_EXPERIMENTAL_RESOLVER=yes
else
BUILD_EXPERIMENTAL_RESOLVER=no
fi
AC_SUBST(BUILD_EXPERIMENTAL_RESOLVER)
use_shared_memory=yes use_shared_memory=yes
AC_ARG_WITH(shared-memory, AC_ARG_WITH(shared-memory,

1
tests/lettuce/features/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/resolver_basic.feature

0
tests/lettuce/features/resolver_basic.feature → tests/lettuce/features/resolver_basic.feature.disabled
View File

5
tests/lettuce/setup_intree_bind10.sh.in
View File

@@ -34,6 +34,11 @@ if test $SET_ENV_LIBRARY_PATH = yes; then
export @ENV_LIBRARY_PATH@ export @ENV_LIBRARY_PATH@
fi fi
BUILD_EXPERIMENTAL_RESOLVER=@BUILD_EXPERIMENTAL_RESOLVER@
if test $BUILD_EXPERIMENTAL_RESOLVER = yes; then
cp -f @srcdir@/features/resolver_basic.feature.disabled @srcdir@/features/resolver_basic.feature
fi
B10_FROM_SOURCE=@abs_top_srcdir@ B10_FROM_SOURCE=@abs_top_srcdir@
export B10_FROM_SOURCE export B10_FROM_SOURCE
# TODO: We need to do this feature based (ie. no general from_source) # TODO: We need to do this feature based (ie. no general from_source)