Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
27e7da68
Commit
27e7da68
authored
Sep 02, 2020
by
Quanah Gibson-Mount
Browse files
Issue#9333 - Delete unused TIMING variable left over from OpenLDAP 2.0
parent
c714acb7
Changes
102
Hide whitespace changes
Inline
Side-by-side
tests/data/regressions/its4184/its4184
View file @
27e7da68
...
...
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
fi
echo
"Starting slapd on TCP/IP port
$PORT1
..."
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
tests/data/regressions/its4326/its4326
View file @
27e7da68
...
...
@@ -41,7 +41,7 @@ if test $RC != 0 ; then
fi
echo
"Starting slapd on TCP/IP port
$PORT1
..."
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
SERVERPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
SERVERPID
$SERVERPID
...
...
@@ -71,7 +71,7 @@ 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 &
$SLAPD
-f
$CONF2
-h
$URI2
-d
$LVL
>
$LOG2
2>&1 &
PROXYPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PROXYPID
$PROXYPID
...
...
@@ -167,7 +167,7 @@ case $RC in
esac
echo
"Restarting slapd on TCP/IP port
$PORT1
..."
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
SERVERPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
SERVERPID
$SERVERPID
...
...
tests/data/regressions/its4336/its4336
View file @
27e7da68
...
...
@@ -46,7 +46,7 @@ if test $RC != 0 ; then
fi
echo
"Starting slapd on TCP/IP port
$PORT1
..."
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
SERVERPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
SERVERPID
$SERVERPID
...
...
@@ -76,7 +76,7 @@ fi
echo
"Starting chain slapd on TCP/IP port
$PORT2
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$ITSDIR
/slapd.conf
>
$CONF2
$SLAPD
-f
$CONF2
-h
$URI2
-d
$LVL
$TIMING
>
$LOG2
2>&1 &
$SLAPD
-f
$CONF2
-h
$URI2
-d
$LVL
>
$LOG2
2>&1 &
PROXYPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PROXYPID
$PROXYPID
...
...
tests/data/regressions/its4448/its4448
View file @
27e7da68
...
...
@@ -49,7 +49,7 @@ ITSCONF=$ITSDIR/slapd-meta.conf
echo
"Starting slapd on TCP/IP port
$PORT1
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$CONF
>
$CONF1
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
@@ -105,7 +105,7 @@ fi
echo
"Starting slapd on TCP/IP port
$PORT2
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$METACONF2
>
$CONF2
$SLAPD
-f
$CONF2
-h
$URI2
-d
$LVL
$TIMING
>
$LOG2
2>&1 &
$SLAPD
-f
$CONF2
-h
$URI2
-d
$LVL
>
$LOG2
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
@@ -144,7 +144,7 @@ fi
echo
"Starting slapd on TCP/IP port
$PORT3
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$ITSCONF
>
$CONF3
$SLAPD
-f
$CONF3
-h
$URI3
-d
$LVL
$TIMING
>
$LOG3
2>&1 &
$SLAPD
-f
$CONF3
-h
$URI3
-d
$LVL
>
$LOG3
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
tests/data/regressions/its6794/its6794
View file @
27e7da68
...
...
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
fi
echo
"Starting slapd on TCP/IP port
$PORT1
..."
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
tests/data/regressions/its7573/its7573
View file @
27e7da68
...
...
@@ -34,7 +34,7 @@ echo "Starting slapd on TCP/IP port $PORT1... $PWD"
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$DYNAMICCONF
>
$CONFLDIF
$SLAPADD
-F
$CONFDIR
-n
0
-l
$CONFLDIF
cd
$TESTDIR
$SLAPD
-F
./slapd.d
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-F
./slapd.d
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
tests/data/regressions/its8427/its8427
View file @
27e7da68
...
...
@@ -139,7 +139,7 @@ olcOverlay: syncprov
EOF
echo
"Starting provider..."
$SLAPD
-F
./slapd.d
-h
"
$SURIP1
ldaps://127.0.0.2:
$PORT1
"
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-F
./slapd.d
-h
"
$SURIP1
ldaps://127.0.0.2:
$PORT1
"
-d
$LVL
>
$LOG1
2>&1 &
MASTERPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
MASTERPID
$MASTERPID
...
...
@@ -181,7 +181,7 @@ olcSyncRepl: rid=001 provider=ldaps://127.0.0.2:$PORT1
EOF
echo
"Starting consumer..."
$SLAPD
-F
./slapd.d
-h
$URI2
-d
$LVL
$TIMING
>
$LOG2
2>&1 &
$SLAPD
-F
./slapd.d
-h
$URI2
-d
$LVL
>
$LOG2
2>&1 &
SLAVEPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
SLAVEPID
$SLAVEPID
...
...
@@ -252,7 +252,7 @@ sleep $SLEEP2
echo
"======================= RESTART ======================="
>>
$LOG1
cd
$TESTDIR
/srv1
$SLAPD
-F
slapd.d
-h
"
$SURIP1
ldaps://127.0.0.2:
$PORT1
"
-d
$LVL
$TIMING
>>
$LOG1
2>&1 &
$SLAPD
-F
slapd.d
-h
"
$SURIP1
ldaps://127.0.0.2:
$PORT1
"
-d
$LVL
>>
$LOG1
2>&1 &
MASTERPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
MASTERPID
$MASTERPID
...
...
tests/data/regressions/its8427/its8427-2
View file @
27e7da68
...
...
@@ -53,7 +53,7 @@ echo "database config" >> $CONF1
echo
"include
$TESTDIR
/configpw.conf"
>>
$CONF1
echo
"Starting slapd listening on
$URIP1
and
$SURIP2
..."
$SLAPD
-f
$CONF1
-h
"
$URIP1
$SURIP2
"
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
"
$URIP1
$SURIP2
"
-d
$LVL
>
$LOG1
2>&1 &
SERVERPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
SERVERPID
$SERVERPID
...
...
@@ -86,7 +86,7 @@ echo "include $TESTDIR/configpw.conf" >> $CONF2
echo
"Starting proxy slapd on TCP/IP port
$PORT3
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$ITSDIR
/slapd.conf
>
$CONF2
$SLAPD
-f
$CONF2
-h
$URI3
-d
$LVL
$TIMING
>
$LOG2
2>&1 &
$SLAPD
-f
$CONF2
-h
$URI3
-d
$LVL
>
$LOG2
2>&1 &
PROXYPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PROXYPID
$PROXYPID
...
...
tests/data/regressions/its8444/its8444
View file @
27e7da68
...
...
@@ -72,7 +72,7 @@ while [ $n -le $MPR ]; do
CFDIR
=
${
XDIR
}
$n
/slapd.d
echo
"Starting provider slapd on TCP/IP URI
$MYURI
"
$SLAPD
-F
$CFDIR
-h
$MYURI
-d
$LVL
$TIMING
>
$MYLOG
2>&1 &
$SLAPD
-F
$CFDIR
-h
$MYURI
-d
$LVL
>
$MYLOG
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
...
...
tests/data/regressions/its8521/its8521
View file @
27e7da68
...
...
@@ -47,7 +47,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
echo
"Starting provider slapd on TCP/IP port
$PORT1
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$ITSDIR
/slapd-provider.ldif
>
$CONFLDIF
$SLAPADD
-F
$CFPRO
-n
0
-l
$CONFLDIF
$SLAPD
-F
$CFPRO
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-F
$CFPRO
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
@@ -78,7 +78,7 @@ fi
echo
"Starting consumer slapd on TCP/IP port
$PORT2
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$ITSDIR
/slapd-consumer.ldif
>
$CONFLDIF
$SLAPADD
-F
$CFCON
-n
0
-l
$CONFLDIF
$SLAPD
-F
$CFCON
-h
$URI2
-d
$LVL
$TIMING
>
$LOG2
2>&1 &
$SLAPD
-F
$CFCON
-h
$URI2
-d
$LVL
>
$LOG2
2>&1 &
SLAVEPID
=
$!
if
test
$WAIT
!=
0
;
then
echo
SLAVEPID
$SLAVEPID
...
...
tests/data/regressions/its8616/its8616
View file @
27e7da68
...
...
@@ -40,7 +40,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
echo
"Starting provider slapd on TCP/IP port
$PORT1
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$ITSDIR
/slapd-provider.ldif
>
$CONFLDIF
$SLAPADD
-F
$CFPRO
-n
0
-l
$CONFLDIF
$SLAPD
-F
$CFPRO
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-F
$CFPRO
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
tests/data/regressions/its8663/its8663
View file @
27e7da68
...
...
@@ -40,7 +40,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
echo
"Starting provider slapd on TCP/IP port
$PORT1
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$ITSDIR
/slapd-provider.ldif
>
$CONFLDIF
$SLAPADD
-F
$CFPRO
-n
0
-l
$CONFLDIF
$SLAPD
-F
$CFPRO
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-F
$CFPRO
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
tests/data/regressions/its8752/its8752
View file @
27e7da68
...
...
@@ -69,7 +69,7 @@ KILLPIDS=
echo
"Starting slapd on TCP/IP port
$PORT1
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$ITSDIR
/slapd.conf
>
$CONF1
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
@@ -182,7 +182,7 @@ while [ $n -le $MPR ]; do
if
[
-f
$TESTDIR
/slapd.conf
]
;
then
rm
-f
$TESTDIR
/slapd.conf
fi
$SLAPD
-f
$MYCONF
-h
$MYURI
-d
$LVL
$TIMING
>>
$MYLOG
2>&1 &
$SLAPD
-f
$MYCONF
-h
$MYURI
-d
$LVL
>>
$MYLOG
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
@@ -400,7 +400,7 @@ while [ $n -le $MPR ]; do
if
[
-f
$TESTDIR
/slapd.conf
]
;
then
rm
-f
$TESTDIR
/slapd.conf
fi
$SLAPD
-f
$MYCONF
-h
$MYURI
-d
$LVL
$TIMING
>>
$MYLOG
2>&1 &
$SLAPD
-f
$MYCONF
-h
$MYURI
-d
$LVL
>>
$MYLOG
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
tests/data/regressions/its8800/its8800
View file @
27e7da68
...
...
@@ -70,7 +70,7 @@ while [ $n -le $MPR ]; do
CFDIR
=
${
XDIR
}
$n
/slapd.d
echo
"Starting provider slapd on TCP/IP URI
$MYURI
"
$SLAPD
-F
$CFDIR
-h
$MYURI
-d
$LVL
$TIMING
>
$MYLOG
2>&1 &
$SLAPD
-F
$CFDIR
-h
$MYURI
-d
$LVL
>
$MYLOG
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
...
...
@@ -146,7 +146,7 @@ echo "done"
echo
"Starting provider1 slapd on TCP/IP URI
$URI1
"
CFDIR
=
"
$TESTDIR
/srv1/slapd.d"
$SLAPD
-F
$CFDIR
-h
$URI1
-d
$LVL
$TIMING
>>
$LOG1
2>&1 &
$SLAPD
-F
$CFDIR
-h
$URI1
-d
$LVL
>>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
...
...
tests/data/regressions/its9282/its9282
View file @
27e7da68
...
...
@@ -67,7 +67,7 @@ while [ $n -le $MMR ]; do
CFDIR
=
${
XDIR
}
$n
/slapd.d
echo
"Starting provider slapd on TCP/IP URI
$MYURI
"
$SLAPD
-F
$CFDIR
-h
$MYURI
-d
$LVL
-d
sync
$TIMING
>
$MYLOG
2>&1 &
$SLAPD
-F
$CFDIR
-h
$MYURI
-d
$LVL
-d
sync
>
$MYLOG
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
...
...
@@ -181,7 +181,7 @@ $LDAPSEARCH -D $MANAGERDN -w $PASSWD -b "$BASEDN" -H $URI2 \
echo
"Starting provider1 slapd on TCP/IP URI
$URI1
"
CFDIR
=
"
$TESTDIR
/srv1/slapd.d"
$SLAPD
-F
$CFDIR
-h
$URI1
-d
$LVL
$TIMING
>>
$LOG1
2>&1 &
$SLAPD
-F
$CFDIR
-h
$URI1
-d
$LVL
>>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
...
...
tests/scripts/passwd-search
View file @
27e7da68
...
...
@@ -33,7 +33,7 @@ mkdir -p $TESTDIR
echo
"Starting slapd on TCP/IP port
$PORT1
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$PASSWDCONF
>
$CONF1
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
${
WAIT
-0
}
!=
0
;
then
echo
PID
$PID
...
...
tests/scripts/relay
View file @
27e7da68
...
...
@@ -19,7 +19,7 @@ echo ""
echo
"Starting slapd on TCP/IP port
$PORT1
..."
echo
"======== Starting slapd with
$RELAY
backend ========"
>>
$LOG1
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$RELAYCONF
>
$CONF1
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
tests/scripts/sql-test000-read
View file @
27e7da68
...
...
@@ -30,7 +30,7 @@ mkdir -p $TESTDIR
echo
"Starting slapd on TCP/IP port
$PORT1
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$SQLCONF
>
$CONF1
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
tests/scripts/sql-test001-concurrency
View file @
27e7da68
...
...
@@ -41,7 +41,7 @@ mkdir -p $TESTDIR $SQLDATADIR
echo
"Starting slapd on TCP/IP port
$PORT1
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$SQLCONF
>
$CONF1
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
tests/scripts/sql-test900-write
View file @
27e7da68
...
...
@@ -35,7 +35,7 @@ mkdir -p $TESTDIR
echo
"Starting slapd on TCP/IP port
$PORT1
..."
.
$CONFFILTER
$BACKEND
$MONITORDB
<
$SQLCONF
>
$CONF1
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
$TIMING
>
$LOG1
2>&1 &
$SLAPD
-f
$CONF1
-h
$URI1
-d
$LVL
>
$LOG1
2>&1 &
PID
=
$!
if
test
$WAIT
!=
0
;
then
echo
PID
$PID
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment