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

Also fix configure argument name to match help documentation.

diff --git a/configure.ac b/configure.ac
index e153d932f321495662fea15b3dffb35bca8a448b..7857fd9aa023d32c8c2a0fa9ef7fe67f35b2ce72 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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,

diff --git a/tests/lettuce/features/.gitignore b/tests/lettuce/features/.gitignore
new file mode 100644 (file)
index 0000000..0634dc7
--- /dev/null
+++ b/tests/lettuce/features/.gitignore
@@ -0,0 +1 @@
+/resolver_basic.feature

diff --git a/tests/lettuce/features/resolver_basic.feature b/tests/lettuce/features/resolver_basic.feature.disabled
similarity index 100%
rename from tests/lettuce/features/resolver_basic.feature
rename to tests/lettuce/features/resolver_basic.feature.disabled

diff --git a/tests/lettuce/setup_intree_bind10.sh.in b/tests/lettuce/setup_intree_bind10.sh.in
index ffe0434462270d3cb09906d81647f67261cbc8c0..600f5c4c5631b41c93204da5eac56c86d5c8f8d6 100755 (executable)
--- a/tests/lettuce/setup_intree_bind10.sh.in
+++ b/tests/lettuce/setup_intree_bind10.sh.in
@@ -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)