mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-fixing ITS#2667: test -a and test -o unportable, use && and ||.

Browse Source
This commit is contained in:
Hallvard Furuseth 2007-05-18 15:23:28 +00:00
parent f906a99eec
commit 73aaead5bd
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/ldaptcl/configure.in
View File

@ -52,7 +52,8 @@ AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.0 binaries from DIR],
case "$with_tk" in
yes)
if test -f $exec_prefix/lib/tkConfig.sh -a $exec_prefix/lib/tkxConfig.sh
if test -f $exec_prefix/lib/tkConfig.sh &&
test -f $exec_prefix/lib/tkxConfig.sh
then
:
else

4
tests/run.in
View File

@ -55,10 +55,10 @@ AC_THREADS=threads@BUILD_THREAD@
AC_LIBS_DYNAMIC=lib@BUILD_LIBS_DYNAMIC@
# sanitize
if test "${AC_ldap}" = "ldapmod" -a "${AC_LIBS_DYNAMIC}" = "static" ; then
if test "${AC_ldap}" = "ldapmod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
AC_ldap="ldapno"
fi
if test "${AC_meta}" = "metamod" -a "${AC_LIBS_DYNAMIC}" = "static" ; then
if test "${AC_meta}" = "metamod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
AC_meta="metano"
fi

2
tests/scripts/test045-syncreplication-proxied
View File

@ -141,7 +141,7 @@ for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \
'(objectClass=*)' > /dev/null 2>&1
RC=$?
if test $RC = 0 -o $RC = 53 ; then
if test $RC = 0 || test $RC = 53 ; then
break
fi
echo "Waiting 5 seconds for slapd to start..."