From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 10 Apr 1999 04:42:33 +0000 (+0000)
Subject: 'make test' now tests both BDB2 and LDBM backends.
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~214
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6585d34a0f71e544ec72c992ed190622542c3ff8;p=openldap

'make test' now tests both BDB2 and LDBM backends.
'make bdb2' tests only BDB2
'make ldbm' tests only LDBM
Fix up scripts (previous changes broke BDB2 testing)
---

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 297eca982c..1c2018492f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -6,6 +6,10 @@ SUBDIRS= progs
 
 BUILD_BDB2 = @BUILD_BDB2@
 
+test: tests
+tests: bdb2 ldbm
+
+bdb2: test-bdb2
 test-bdb2:	FORCE
 	@-$(LN_S) $(srcdir)/data . 
 	@if test "$(BUILD_BDB2)" = "yes" ; then \
@@ -16,8 +20,7 @@ test-bdb2:	FORCE
 		echo "run configure with --enable-bdb2" ; \
 	fi
 
-tests:		test-ldbm
-test:		test-ldbm
+ldbm: test-ldbm
 test-ldbm:	FORCE
 	@-$(LN_S) $(srcdir)/data .
 	@echo "Initiating LDAP tests..."
diff --git a/tests/scripts/test001-ldif2ldbm b/tests/scripts/test001-ldif2ldbm
index bef89cc8ca..82945b9167 100755
--- a/tests/scripts/test001-ldif2ldbm
+++ b/tests/scripts/test001-ldif2ldbm
@@ -6,10 +6,10 @@ else
 	SRCDIR=$1; shift
 fi
 if [ $# -eq 1 ]; then
-	BDB2=$1; shift
+	BACKEND=$1; shift
 fi
 
-echo "running defines.sh $SRCDIR $BDB2"
+echo "running defines.sh $SRCDIR $BACKEND"
 
 . $SRCDIR/scripts/defines.sh
 
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index bef89cc8ca..82945b9167 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -6,10 +6,10 @@ else
 	SRCDIR=$1; shift
 fi
 if [ $# -eq 1 ]; then
-	BDB2=$1; shift
+	BACKEND=$1; shift
 fi
 
-echo "running defines.sh $SRCDIR $BDB2"
+echo "running defines.sh $SRCDIR $BACKEND"
 
 . $SRCDIR/scripts/defines.sh
 
diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 4efcca064f..d4b0c9c2cd 100755
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -6,9 +6,10 @@ else
 	SRCDIR=$1; shift
 fi
 if [ $# -eq 1 ]; then
-	BDB2=$1; shift
+	BACKEND=$1; shift
 fi
 
+echo "running defines.sh $SRCDIR $BACKEND"
 . $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 7adf3a9232..bd96230e9c 100755
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -6,9 +6,10 @@ else
 	SRCDIR=$1; shift
 fi
 if [ $# -eq 1 ]; then
-	BDB2=$1; shift
+	BACKEND=$1; shift
 fi
 
+echo "running defines.sh $SRCDIR $BACKEND"
 . $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 556c66d8a3..e64f1e2392 100755
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -6,9 +6,10 @@ else
 	SRCDIR=$1; shift
 fi
 if [ $# -eq 1 ]; then
-	BDB2=$1; shift
+	BACKEND=$1; shift
 fi
 
+echo "running defines.sh $SRCDIR $BACKEND"
 . $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 10ee4531ac..a525922a56 100755
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -6,9 +6,10 @@ else
 	SRCDIR=$1; shift
 fi
 if [ $# -eq 1 ]; then
-	BDB2=$1; shift
+	BACKEND=$1; shift
 fi
 
+echo "running defines.sh $SRCDIR $BACKEND"
 . $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index d83700ca94..e33067637a 100755
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -6,9 +6,10 @@ else
 	SRCDIR=$1; shift
 fi
 if [ $# -eq 1 ]; then
-	BDB2=$1; shift
+	BACKEND=$1; shift
 fi
 
+echo "running defines.sh $SRCDIR $BACKEND"
 . $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 33646e2374..a30586604f 100755
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -16,9 +16,10 @@ else
 	SRCDIR=$1; shift
 fi
 if [ $# -eq 1 ]; then
-	BDB2=$1; shift
+	BACKEND=$1; shift
 fi
 
+echo "running defines.sh $SRCDIR $BACKEND"
 . $SRCDIR/scripts/defines.sh
 
 if test ! -x $SLURPD ; then
diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index e19d21adbe..89597b9e64 100755
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -6,10 +6,10 @@ else
 	SRCDIR=$1; shift
 fi
 if [ $# -eq 1 ]; then
-	BDB2=$1; shift
+	BACKEND=$1; shift
 fi
 
-echo "running defines.sh $SRCDIR $BDB2"
+echo "running defines.sh $SRCDIR $BACKEND"
 
 . $SRCDIR/scripts/defines.sh