From 1c73847a2c27d52dda1e97fd97968a7611f75d3e Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 14 Dec 2007 20:03:09 +0000 Subject: [PATCH] Replace hard coded directory references with TESTDIR variable --- tests/scripts/test024-unique | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/scripts/test024-unique b/tests/scripts/test024-unique index b00bbdfc9d..f116c09f09 100755 --- a/tests/scripts/test024-unique +++ b/tests/scripts/test024-unique @@ -36,8 +36,8 @@ if test $RC != 0 ; then 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 @@ if test $RC != 19 ; then 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 <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 <$TESTDIR/initial-reference.ldif dn: olcOverlay={0}unique,olcDatabase={1}$BACKEND,cn=config objectClass: olcOverlayConfig objectClass: olcUniqueConfig @@ -125,7 +125,7 @@ olcUniqueAttribute: employeeNumber 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 @@ if test $RC != 80 ; then 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 @@ if test $RC != 0 ; then 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 <$TESTDIR/baseremoval-config.ldif +cat >$TESTDIR/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 @@ if test $RC != 0 ; then 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 <$TESTDIR/second-config.ldif +cat >$TESTDIR/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 @@ if test $RC != 80 ; then 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 @@ if test $RC != 0 ; then 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 <$TESTDIR/third-config.ldif +cat >$TESTDIR/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 @@ if test $RC != 0 ; then 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 <$TESTDIR/fourth-config.ldif +cat >$TESTDIR/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." -- 2.39.5