Merge remote-tracking branch 'origin/mdb.master'

[openldap] / tests / scripts / test062-config-delete

diff --git a/tests/scripts/test062-config-delete b/tests/scripts/test062-config-delete
index 0cb103953b5c7cb30f8f735e03762b68bb3a6726..2879b983fdaf058b5b65b84df824edf046fbb003 100755 (executable)
--- a/tests/scripts/test062-config-delete
+++ b/tests/scripts/test062-config-delete
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2011 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -106,7 +106,7 @@ rm -f $RCOUT
 (
   $LDAPSEARCH -D cn=config -H $URI1 -y $CONFIGPWF -bcn=config -E \!sync=rp >/dev/null 2>&1
   RC=$?
-  touch $RCOUT
+  echo $RC > $RCOUT
   exit $RC
 ) &
 
@@ -137,10 +137,10 @@ done
 
 if test -f "$RCOUT" ; then
        wait $SEARCHPID
-       SEARCHRC=$?
+       SEARCHRC=`cat $RCOUT`
        echo "Checking return code of backgrounded RefreshAndPersist search ..."
-       if test $SEARCHRC != 52 ; then
-               echo "Error: Backgrounded ldapsearch did return the wrong error code: $SEARCHRC"
+       if test 52 != "$SEARCHRC" ; then
+               echo "Error: Backgrounded ldapsearch returned the wrong error code: $SEARCHRC"
                RC=1
        else
                echo "Exit code correct."