From d52d2f5bcc877ea832307efae91626a035c40433 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 11 Jan 2011 20:45:58 +0000
Subject: [PATCH] ITS#6782

---
 CHANGES                                          | 1 +
 tests/scripts/test049-sync-config                | 2 +-
 tests/scripts/test050-syncrepl-multimaster       | 4 ++--
 tests/scripts/test058-syncrepl-asymmetric        | 8 ++++----
 tests/scripts/test061-syncreplication-initiation | 8 ++++----
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 28768b8374..3ae2fcec64 100644
--- a/CHANGES
+++ b/CHANGES
@@ -117,6 +117,7 @@ OpenLDAP 2.4.24 Engineering
 		Fixed libldap unnecessary ifdef's (ITS#6603)
 		Fixed slapd-tester EOF handling (ITS#6723)
 		Fixed slapd-tester filter initialization (ITS#6735)
+		Fixed test scripts with alternate testdir (ITS#6782)
 		Removed antiquated SunOS LWP support (ITS#6669)
 	Documentation
 		admin24 guide fix examples (ITS#6681)
diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config
index 5d2fd68468..58b5f153d3 100755
--- a/tests/scripts/test049-sync-config
+++ b/tests/scripts/test049-sync-config
@@ -97,7 +97,7 @@ if [ "$SYNCPROV" = syncprovmod ]; then
 dn: cn=module,cn=config
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/overlays
+olcModulePath: $TESTWD/../servers/slapd/overlays
 olcModuleLoad: syncprov.la
 EOF
 	RC=$?
diff --git a/tests/scripts/test050-syncrepl-multimaster b/tests/scripts/test050-syncrepl-multimaster
index f65d529083..9492896f85 100755
--- a/tests/scripts/test050-syncrepl-multimaster
+++ b/tests/scripts/test050-syncrepl-multimaster
@@ -122,7 +122,7 @@ dn: cn=module,cn=config
 changetype: add
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/overlays
+olcModulePath: $TESTWD/../servers/slapd/overlays
 olcModuleLoad: syncprov.la
 
 EOF
@@ -267,7 +267,7 @@ cat <<EOF >> $TMP
 dn: cn=module,cn=config
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/back-$BACKEND
+olcModulePath: $TESTWD/../servers/slapd/back-$BACKEND
 olcModuleLoad: back_$BACKEND.la
 
 EOF
diff --git a/tests/scripts/test058-syncrepl-asymmetric b/tests/scripts/test058-syncrepl-asymmetric
index 881fc53eb8..d5de5a06bd 100755
--- a/tests/scripts/test058-syncrepl-asymmetric
+++ b/tests/scripts/test058-syncrepl-asymmetric
@@ -373,7 +373,7 @@ EOF
 dn: cn=module,cn=config
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/back-$BACKEND
+olcModulePath: $TESTWD/../servers/slapd/back-$BACKEND
 olcModuleLoad: back_$BACKEND.la
 EOF
 	RC=$?
@@ -390,7 +390,7 @@ if [ "$SYNCPROV" = syncprovmod ]; then
 dn: cn=module,cn=config
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/overlays
+olcModulePath: $TESTWD/../servers/slapd/overlays
 olcModuleLoad: syncprov.la
 
 EOF
@@ -484,7 +484,7 @@ if [ "$SYNCPROV" = syncprovmod ]; then
 dn: cn=module,cn=config
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/overlays
+olcModulePath: $TESTWD/../servers/slapd/overlays
 olcModuleLoad: syncprov.la
 
 EOF
@@ -557,7 +557,7 @@ if [ "$SYNCPROV" = syncprovmod ]; then
 dn: cn=module,cn=config
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/overlays
+olcModulePath: $TESTWD/../servers/slapd/overlays
 olcModuleLoad: syncprov.la
 
 EOF
diff --git a/tests/scripts/test061-syncreplication-initiation b/tests/scripts/test061-syncreplication-initiation
index d2b3379f33..6f4bde38c5 100755
--- a/tests/scripts/test061-syncreplication-initiation
+++ b/tests/scripts/test061-syncreplication-initiation
@@ -188,7 +188,7 @@ EOF
 dn: cn=module,cn=config
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/back-$BACKEND
+olcModulePath: $TESTWD/../servers/slapd/back-$BACKEND
 olcModuleLoad: back_$BACKEND.la
 
 EOF
@@ -201,12 +201,12 @@ EOF
 done
 
 syncprov_module=''
-[ "$AC_syncprov" = syncprovmod ] && syncprov_module='
+[ "$AC_syncprov" = syncprovmod ] && syncprov_module="
 dn: cn=module,cn=config
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/overlays
-olcModuleLoad: syncprov.la'
+olcModulePath: $TESTWD/../servers/slapd/overlays
+olcModuleLoad: syncprov.la"
 
 for uri in $PROV_URI; do
 	echo "Adding database configuration on $uri"
-- 
2.39.5