mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
cleanup
This commit is contained in:
parent
d48653d64a
commit
cad464e96d
@ -22,7 +22,7 @@ cn: User 1
|
||||
sn: User 1
|
||||
uid: user1
|
||||
uidNumber: 500
|
||||
userPassword: {crypt}675B8Gwn6RJyY
|
||||
userPassword: abc
|
||||
homeDirectory: /home/user1
|
||||
gidNumber: 10
|
||||
gecos: User 1
|
||||
@ -47,7 +47,7 @@ homeDirectory: /home/user3
|
||||
loginShell: /bin/false
|
||||
gecos: Slave
|
||||
gidNumber: 100
|
||||
userPassword: {crypt}675B8Gwn6RJyY
|
||||
userPassword: abc
|
||||
cn: Slave
|
||||
sn: Slave
|
||||
|
||||
@ -62,7 +62,7 @@ gecos: User 2
|
||||
loginShell: /bin/false
|
||||
homeDirectory: /home/user2
|
||||
gidNumber: 100
|
||||
userPassword: {crypt}675B8Gwn6RJyY
|
||||
userPassword: abc
|
||||
|
||||
dn: ou=Special,dc=example,dc=com
|
||||
objectClass: organizationalUnit
|
||||
@ -78,6 +78,6 @@ uidNumber: 6319
|
||||
homeDirectory: /home/special1
|
||||
gecos: Special1
|
||||
loginShell: /bin/false
|
||||
userPassword: {crypt}675B8Gwn6RJyY
|
||||
userPassword: abc
|
||||
gidNumber: 100
|
||||
|
||||
|
@ -88,4 +88,7 @@ done
|
||||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
echo ">>>>> Test succeeded"
|
||||
|
||||
test $KILLSERVERS != no && wait
|
||||
|
||||
exit 0
|
||||
|
@ -42,8 +42,10 @@ directory @TESTDIR@/db.2.a
|
||||
|
||||
# Indices to maintain
|
||||
#bdb#index default pres,eq
|
||||
#bdb#index objectClass eq
|
||||
#bdb#index sn pres,eq,sub
|
||||
#hdb#index default pres,eq
|
||||
#hdb#index objectClass eq
|
||||
#hdb#index sn pres,eq,sub
|
||||
|
||||
database @BACKEND@
|
||||
@ -54,9 +56,9 @@ directory @TESTDIR@/db.1.a
|
||||
|
||||
# Indices to maintain
|
||||
#bdb#index default pres,eq
|
||||
#bdb#index sn pres,eq,sub
|
||||
#bdb#index objectClass eq
|
||||
#bdb#index sn pres,eq,sub
|
||||
#hdb#index default pres,eq
|
||||
#hdb#index sn pres,eq,sub
|
||||
#hdb#index objectClass eq
|
||||
#hdb#index sn pres,eq,sub
|
||||
|
||||
|
@ -64,21 +64,8 @@ if test $RC != 0 ; then
|
||||
exit $RC
|
||||
fi
|
||||
|
||||
echo "Running slapadd to create glue entry..."
|
||||
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
|
||||
#$SLAPADD -f $CONF2 << EODATA
|
||||
#dn: dc=example,dc=com
|
||||
#objectClass: domain
|
||||
#dc: example
|
||||
#EODATA
|
||||
#RC=$?
|
||||
#if test $RC != 0 ; then
|
||||
# echo "slapadd failed ($RC)!"
|
||||
# test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
# exit $RC
|
||||
#fi
|
||||
|
||||
echo "Starting proxy slapd on TCP/IP port $PORT2..."
|
||||
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
|
||||
$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
|
||||
PROXYPID=$!
|
||||
if test $WAIT != 0 ; then
|
||||
@ -128,7 +115,7 @@ if test $RC != 0 ; then
|
||||
fi
|
||||
|
||||
SLEEP=2
|
||||
echo "Stopping the provider and sleeping $SLEEP seconds..."
|
||||
echo "Stopping the server and sleeping $SLEEP seconds..."
|
||||
kill -HUP "$SERVERPID"
|
||||
wait $SERVERPID
|
||||
sleep $SLEEP
|
||||
|
@ -16,7 +16,6 @@
|
||||
SHTOOL="$SRCDIR/../build/shtool"
|
||||
TB=`$SHTOOL echo -e "%B"`
|
||||
TN=`$SHTOOL echo -e "%b"`
|
||||
SLEEPTIME=10
|
||||
|
||||
echo "#######################################################################"
|
||||
echo "### ###"
|
||||
@ -46,6 +45,5 @@ for CMD in $SRCDIR/data/regressions/its*/its*; do
|
||||
fi
|
||||
|
||||
echo ">>>>> waiting $SLEEPTIME seconds for things to exit"
|
||||
sleep $SLEEPTIME
|
||||
echo ""
|
||||
done
|
||||
|
Loading…
Reference in New Issue
Block a user