[Date Prev][Date Next] [Chronological] [Thread] [Top]

Avoid use of hardcoded paths in test suite

To: OpenLDAP Devel <openldap-devel@openldap.org>
Subject: Avoid use of hardcoded paths in test suite
From: Buchan Milne <bgmilne@staff.telkomsa.net>
Date: Tue, 11 Dec 2007 18:09:04 +0200
User-agent: KMail/1.9.7

Please replace the hardcoded testrun in test024 with ${TESTDIR}. This avoids 
the need for the user running the test suite to have write access to the 
installed test suite (as is the case when shipping the test suite as a 
package). The attached patch fixes this on 2.4.6. If *really* necessary, I'll 
file an ITS ...

Regards,
Buchan

--- scripts/orig.test024-unique	2007-09-01 01:14:09.000000000 +0200
+++ scripts/test024-unique	2007-12-11 15:37:07.000000000 +0200
@@ -36,8 +36,8 @@
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-mkdir testrun/confdir
-$SLAPD -f $CONF1 -F testrun/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+mkdir $TESTDIR/confdir
+$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -114,8 +114,8 @@
 fi
 
 echo Dynamically retrieving initial configuration...
-$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >testrun/initial-config.ldif
-cat <<EOF >testrun/initial-reference.ldif
+$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >${TESTDIR}/initial-config.ldif
+cat <<EOF >${TESTDIR}/initial-reference.ldif
 dn: olcOverlay={0}unique,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig
 objectClass: olcUniqueConfig
@@ -125,7 +125,7 @@
 olcUniqueAttribute: displayName
 
 EOF
-diff testrun/initial-config.ldif testrun/initial-reference.ldif > /dev/null 2>&1
+diff ${TESTDIR}/initial-config.ldif ${TESTDIR}/initial-reference.ldif > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
     echo "Initial configuration is not reported correctly."
@@ -164,8 +164,8 @@
 fi
 
 echo Verifying initial configuration intact...
-$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >testrun/initial-config-recheck.ldif
-diff testrun/initial-config-recheck.ldif testrun/initial-reference.ldif > /dev/null 2>&1
+$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >${TESTDIR}/initial-config-recheck.ldif
+diff ${TESTDIR}/initial-config-recheck.ldif ${TESTDIR}/initial-reference.ldif > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
     echo "Initial configuration damaged by unsuccessful modifies."
@@ -188,8 +188,8 @@
 fi
 
 echo Verifying base removal...
-$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >testrun/baseremoval-config.ldif
-cat >testrun/baseremoval-reference.ldif <<EOF
+$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >${TESTDIR}/baseremoval-config.ldif
+cat >${TESTDIR}/baseremoval-reference.ldif <<EOF
 dn: olcOverlay={0}unique,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig
 objectClass: olcUniqueConfig
@@ -198,7 +198,7 @@
 olcUniqueAttribute: displayName
 
 EOF
-diff testrun/baseremoval-config.ldif testrun/baseremoval-reference.ldif > /dev/null 2>&1
+diff ${TESTDIR}/baseremoval-config.ldif ${TESTDIR}/baseremoval-reference.ldif > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
     echo "Configuration damaged by base removal"
@@ -305,8 +305,8 @@
 fi
 
 echo Dynamically retrieving second configuration...
-$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >testrun/second-config.ldif
-cat >testrun/second-reference.ldif <<EOF
+$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >${TESTDIR}/second-config.ldif
+cat >${TESTDIR}/second-reference.ldif <<EOF
 dn: olcOverlay={0}unique,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig
 objectClass: olcUniqueConfig
@@ -315,7 +315,7 @@
 olcUniqueURI: ldap:///?description?one
 
 EOF
-diff testrun/second-config.ldif testrun/second-reference.ldif > /dev/null 2>&1
+diff ${TESTDIR}/second-config.ldif ${TESTDIR}/second-reference.ldif > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
     echo "Second configuration is not reported correctly."
@@ -408,8 +408,8 @@
 fi
 
 echo Verifying second configuration intact...
-$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >testrun/second-config-recheck.ldif
-diff testrun/second-config-recheck.ldif testrun/second-reference.ldif > /dev/null 2>&1
+$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >${TESTDIR}/second-config-recheck.ldif
+diff ${TESTDIR}/second-config-recheck.ldif ${TESTDIR}/second-reference.ldif > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
     echo "Second configuration damaged by rejected modifies."
@@ -437,8 +437,8 @@
 fi
 
 echo Dynamically retrieving third configuration...
-$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >testrun/third-config.ldif
-cat >testrun/third-reference.ldif <<EOF
+$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >${TESTDIR}/third-config.ldif
+cat >${TESTDIR}/third-reference.ldif <<EOF
 dn: olcOverlay={0}unique,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig
 objectClass: olcUniqueConfig
@@ -447,7 +447,7 @@
 olcUniqueURI: ldap:///?sn?sub?(cn=e*)
 
 EOF
-diff testrun/third-config.ldif testrun/third-reference.ldif > /dev/null 2>&1
+diff ${TESTDIR}/third-config.ldif ${TESTDIR}/third-reference.ldif > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
     echo "Third configuration is not reported correctly."
@@ -508,8 +508,8 @@
 fi
 
 echo Dynamically retrieving fourth configuration...
-$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >testrun/fourth-config.ldif
-cat >testrun/fourth-reference.ldif <<EOF
+$LDAPSEARCH -S "" -b olcOverlay='{0}'unique,olcDatabase='{1}'$BACKEND,cn=config -D cn=config -y $CONFIGPWF -h $LOCALHOST -p $PORT1 -LLL | tr -d \\r >${TESTDIR}/fourth-config.ldif
+cat >${TESTDIR}/fourth-reference.ldif <<EOF
 dn: olcOverlay={0}unique,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig
 objectClass: olcUniqueConfig
@@ -517,7 +517,7 @@
 olcUniqueURI: ignore ldap:///?objectClass,uid,cn,sn?sub
 
 EOF
-diff testrun/fourth-config.ldif testrun/fourth-reference.ldif > /dev/null 2>&1
+diff ${TESTDIR}/fourth-config.ldif ${TESTDIR}/fourth-reference.ldif > /dev/null 2>&1
 RC=$?
 if test $RC != 0 ; then
     echo "Fourth configuration is not reported correctly."

Prev by Date: Re: 2.3 and 2.4 syncrepl
Next by Date: 'countryName' in core.schema (was : (ITS#5236) core.ldif differs from core.schema)
Index(es):
- Chronological
- Thread