From: Howard Chu <hyc@openldap.org>
Date: Sun, 2 Sep 2007 01:59:04 +0000 (+0000)
Subject: ITS#5117 use absolute FILE URLs 'cause BSD libfetch is braindead
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=54517b9fb26d77d7e28cde37d237d40af39b0fba;p=openldap

ITS#5117 use absolute FILE URLs 'cause BSD libfetch is braindead
---

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 53bf7eb843..a3168c00ed 100755
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -51,6 +51,7 @@ PROGDIR=./progs
 DATADIR=${USER_DATADIR-./testdata}
 TESTDIR=${USER_TESTDIR-$TESTWD/testrun}
 SCHEMADIR=${USER_SCHEMADIR-./schema}
+ABS_SCHEMADIR=`(cd $SCHEMADIR; pwd)`
 
 DBDIR1A=$TESTDIR/db.1.a
 DBDIR1B=$TESTDIR/db.1.b
diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config
index 759fcc58da..978fd2dda2 100755
--- a/tests/scripts/test049-sync-config
+++ b/tests/scripts/test049-sync-config
@@ -187,15 +187,15 @@ fi
 
 echo "Adding schema and databases on producer..."
 $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
-include: file:$SCHEMADIR/core.ldif
+include: file://$ABS_SCHEMADIR/core.ldif
 
-include: file:$SCHEMADIR/cosine.ldif
+include: file://$ABS_SCHEMADIR/cosine.ldif
 
-include: file:$SCHEMADIR/inetorgperson.ldif
+include: file://$ABS_SCHEMADIR/inetorgperson.ldif
 
-include: file:$SCHEMADIR/openldap.ldif
+include: file://$ABS_SCHEMADIR/openldap.ldif
 
-include: file:$SCHEMADIR/nis.ldif
+include: file://$ABS_SCHEMADIR/nis.ldif
 EOF
 RC=$?
 if test $RC != 0 ; then
diff --git a/tests/scripts/test050-syncrepl-multimaster b/tests/scripts/test050-syncrepl-multimaster
index 3f75c4e538..ee2989c45d 100755
--- a/tests/scripts/test050-syncrepl-multimaster
+++ b/tests/scripts/test050-syncrepl-multimaster
@@ -204,15 +204,15 @@ EOF
 
 echo "Adding schema and databases on producer..."
 $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
-include: file:$SCHEMADIR/core.ldif
+include: file://$ABS_SCHEMADIR/core.ldif
 
-include: file:$SCHEMADIR/cosine.ldif
+include: file://$ABS_SCHEMADIR/cosine.ldif
 
-include: file:$SCHEMADIR/inetorgperson.ldif
+include: file://$ABS_SCHEMADIR/inetorgperson.ldif
 
-include: file:$SCHEMADIR/openldap.ldif
+include: file://$ABS_SCHEMADIR/openldap.ldif
 
-include: file:$SCHEMADIR/nis.ldif
+include: file://$ABS_SCHEMADIR/nis.ldif
 EOF
 RC=$?
 if test $RC != 0 ; then