Commit 2fbb93f7 authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

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

Also fix configure argument name to match help documentation.
parent 95e7d858
......@@ -899,11 +899,17 @@ if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$werror_ok" = X1 -a $CLANGP
fi
build_experimental_resolver=no
AC_ARG_ENABLE(experimental_resolver,
AC_ARG_ENABLE(experimental-resolver,
[AC_HELP_STRING([--enable-experimental-resolver],
[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"])
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
AC_ARG_WITH(shared-memory,
......
......@@ -34,6 +34,11 @@ if test $SET_ENV_LIBRARY_PATH = yes; then
export @ENV_LIBRARY_PATH@
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@
export B10_FROM_SOURCE
# TODO: We need to do this feature based (ie. no general from_source)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment