From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 5 Dec 2008 18:27:53 +0000 (+0000)
Subject: ITS#5842
X-Git-Tag: OPENLDAP_REL_ENG_2_4_14~142
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=067682060057bc7edea65adcfa674979f269f71b;p=openldap

ITS#5842
---

diff --git a/CHANGES b/CHANGES
index d4eee3e263..f551107a15 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@ OpenLDAP 2.4 Change Log
 OpenLDAP 2.4.14 Engineering
 	Fixed libldap_r deref building (ITS#5768)
 	Fixed slapd syncrepl rename handling (ITS#5809)
+	Build Environment
+		Fixed test049,test050 to work on windows (ITS#5842)
 
 OpenLDAP 2.4.13 Release (2008/11/24)
 	Added libldap dereference control support (ITS#5768)
diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config
index 1b2629b3d9..e0dd0e5af6 100755
--- a/tests/scripts/test049-sync-config
+++ b/tests/scripts/test049-sync-config
@@ -22,7 +22,7 @@ if test $SYNCPROV = syncprovno; then
 fi 
 
 PRODIR=$TESTDIR/pro
-CONDIR=$TESTDIR/con
+CONDIR=$TESTDIR/con1
 DBPRO=$PRODIR/db
 DBCON=$CONDIR/db
 CFPRO=$PRODIR/slapd.d
diff --git a/tests/scripts/test050-syncrepl-multimaster b/tests/scripts/test050-syncrepl-multimaster
index c3a7d8f42f..90452b1a7c 100755
--- a/tests/scripts/test050-syncrepl-multimaster
+++ b/tests/scripts/test050-syncrepl-multimaster
@@ -22,7 +22,7 @@ if test $SYNCPROV = syncprovno; then
 fi 
 
 PRODIR=$TESTDIR/pro
-CONDIR=$TESTDIR/con
+CONDIR=$TESTDIR/con1
 CONDIR2=$TESTDIR/con2
 DBPRO=$PRODIR/db
 DBCON=$CONDIR/db