From 73aaead5bddf54f209118ce46d0979e3acb5bfe1 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Fri, 18 May 2007 15:23:28 +0000 Subject: [PATCH] Re-fixing ITS#2667: test -a and test -o unportable, use && and ||. --- contrib/ldaptcl/configure.in | 3 ++- tests/run.in | 4 ++-- tests/scripts/test045-syncreplication-proxied | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/ldaptcl/configure.in b/contrib/ldaptcl/configure.in index 71ac2a67b1..9a0364c3a7 100644 --- a/contrib/ldaptcl/configure.in +++ b/contrib/ldaptcl/configure.in @@ -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 diff --git a/tests/run.in b/tests/run.in index f5c11b14ec..24133fbcb5 100644 --- a/tests/run.in +++ b/tests/run.in @@ -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 diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied index 40e7e4bc80..87727fe2ba 100755 --- a/tests/scripts/test045-syncreplication-proxied +++ b/tests/scripts/test045-syncreplication-proxied @@ -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..." -- 2.39.5