Review tweaks (squash this)

diff --git a/tests/run.in b/tests/run.in
index 80370b1bd9eb5c72bf890f9a2fcedd932dfee693..76b3673e72f2de1d072e4e1d3118123007ecde27 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -128,7 +128,7 @@ done
 
 if test -z "$BACKEND" ; then
        for b in mdb ; do
-               if eval "test \"\$AC_$b\" != no" ; then
+               if eval "test \"\$AC_$b\" != ${b}no" ; then
                        BACKEND=$b
                        break
                fi
@@ -143,6 +143,10 @@ BACKENDTYPE=`eval 'echo $AC_'$BACKEND | sed -e s/$BACKEND//`
 if test "x$BACKENDTYPE" = "x" ; then
        BACKENDTYPE="unknown"
 fi
+if test "$BACKENDTYPE" != "yes" -a "$BACKENDTYPE" != "mod" ; then
+       echo "Backend $BACKEND disabled or unknown (type is \"$BACKENDTYPE\")"
+       exit 1
+fi
 
 # Backend features.  indexdb: indexing and unchecked limit.
 # maindb: main storage backend.  Currently index,limits,mode,paged results.

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 47d2caa37e0012639687bb53fc3efeac93f94a53..c416e8b05107083bb2d858ef31829aaa648805d6 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -30,7 +30,7 @@ if [ -n "$TESTINST" ]; then
        BASEPORT=`expr $BASEPORT + $TESTINST \* 10`
 fi
 
-. ./AC_defs.sh
+. "$OBJDIR"/tests/AC_defs.sh
 
 # backends
 BACKLDAP=${AC_ldap-ldapno}