Fix VPATH support.

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index b851971146887233ca505a58f20d29e9fd58a011..952571df0201c647e5853eabda1b6f8d4ac06d8c 100755 (executable)
--- 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 6ab1a5c52b7034a8c5be920560baa1caa772d995..bef89cc8ca4ae9f60c7cad68fd93f00d0c43f4db 100755 (executable)
--- 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 6ab1a5c52b7034a8c5be920560baa1caa772d995..bef89cc8ca4ae9f60c7cad68fd93f00d0c43f4db 100755 (executable)
--- 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 a5838c791867f97fa0c2a9bd64a7c33354423421..7adf3a92328b5c857fa125e66b1c298f4b42b454 100755 (executable)
--- 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 a227160eaee4e1d05b017c062fd99b175e6c5ac8..556c66d8a3a7728809fe599da6ba5557c4ee80e9 100755 (executable)
--- 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 28093e672fd34c62b35dd9d454f4bab6b04e3a83..10ee4531accd7b5902dac0423bc8a58d194386c7 100755 (executable)
--- 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 c9b378f97c5daae31a516f6d22ee1c8745a726de..d83700ca9490ded2876454e8c975e5fd4d7505a5 100755 (executable)
--- 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 b2820ef4c1bee526ca715adb9684bb811904643c..33646e237439514e1f228a66021e535768d22102 100755 (executable)
--- 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 df78da1a560c0ff1f1ead20c92e58196902130ec..e19d21adbe300d2847ea2a9dc09ce14c7bd90e89 100755 (executable)
--- 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"