From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 8 Apr 1999 02:18:54 +0000 (+0000)
Subject: Fix VPATH support.
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~223
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=80b8691eac831f692982c22448311698d08af885;p=openldap

Fix VPATH support.
---

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index b851971146..952571df02 100755
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -1,16 +1,6 @@
-if test $# -eq 0 ; then
-	SRCDIR="."
-else
-	SRCDIR=$1; shift
-fi
-if test $# -eq 0 ; then
-	BACKEND=ldbm
-else
-	BACKEND=$1; shift
-fi
 
 DATADIR=$SRCDIR/data
-PROGDIR=$SRCDIR/progs
+PROGDIR=./progs
 
 if test "$BACKEND" = "bdb2" ; then
 	LDIF2LDBM=../servers/slapd/tools/ldif2ldbm-bdb2
diff --git a/tests/scripts/test001-ldif2ldbm b/tests/scripts/test001-ldif2ldbm
index 6ab1a5c52b..bef89cc8ca 100755
--- a/tests/scripts/test001-ldif2ldbm
+++ b/tests/scripts/test001-ldif2ldbm
@@ -11,7 +11,7 @@ fi
 
 echo "running defines.sh $SRCDIR $BDB2"
 
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
+. $SRCDIR/scripts/defines.sh
 
 echo "Datadir is $DATADIR"
 
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 6ab1a5c52b..bef89cc8ca 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -11,7 +11,7 @@ fi
 
 echo "running defines.sh $SRCDIR $BDB2"
 
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
+. $SRCDIR/scripts/defines.sh
 
 echo "Datadir is $DATADIR"
 
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index a5838c7918..7adf3a9232 100755
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -9,7 +9,7 @@ if [ $# -eq 1 ]; then
 	BDB2=$1; shift
 fi
 
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
+. $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
 
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index a227160eae..556c66d8a3 100755
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -9,7 +9,7 @@ if [ $# -eq 1 ]; then
 	BDB2=$1; shift
 fi
 
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
+. $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
 
diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 28093e672f..10ee4531ac 100755
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -9,7 +9,7 @@ if [ $# -eq 1 ]; then
 	BDB2=$1; shift
 fi
 
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
+. $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
 
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index c9b378f97c..d83700ca94 100755
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -9,7 +9,7 @@ if [ $# -eq 1 ]; then
 	BDB2=$1; shift
 fi
 
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
+. $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
 
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index b2820ef4c1..33646e2374 100755
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -19,7 +19,7 @@ if [ $# -eq 1 ]; then
 	BDB2=$1; shift
 fi
 
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
+. $SRCDIR/scripts/defines.sh
 
 if test ! -x $SLURPD ; then
 	echo ">>>>> $SLURPD is not executable or do not exist."
diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index df78da1a56..e19d21adbe 100755
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -11,7 +11,7 @@ fi
 
 echo "running defines.sh $SRCDIR $BDB2"
 
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
+. $SRCDIR/scripts/defines.sh
 
 echo "Datadir is $DATADIR"