From ea15af2679ac23c5e804823c89007774f416981c Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 29 Dec 2008 16:42:33 +0000
Subject: Fixed to run correctly in VPATH build.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@729935 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/tests/run_acl_tests | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'cpp/src/tests')

diff --git a/cpp/src/tests/run_acl_tests b/cpp/src/tests/run_acl_tests
index 1c1cc562b8..8d583c1895 100755
--- a/cpp/src/tests/run_acl_tests
+++ b/cpp/src/tests/run_acl_tests
@@ -19,8 +19,7 @@
 # under the License.
 #
 
-# Run the acl tests.
-srcdir=`dirname $0`
+# Run the acl tests. $srcdir is set by the Makefile.
 PYTHON_DIR=$srcdir/../../../python
 DATA_DIR=`pwd`/data_dir
 
@@ -36,15 +35,16 @@ stop_brokers() {
 }
 
 test_loading_acl_from_absolute_path(){
-   ../qpidd --daemon --port 0 --no-module-dir --no-data-dir --auth no --load-module ../.libs/acl.so --acl-file $PWD/policy.acl -t --log-to-file temp.log  2>/dev/null
+    POLICY_FILE=$PWD/$srcdir/policy.acl
+   ../qpidd --daemon --port 0 --no-module-dir --no-data-dir --auth no --load-module ../.libs/acl.so --acl-file $POLICY_FILE -t --log-to-file temp.log  2>/dev/null
     PORT=`grep "Listening on TCP port" temp.log | awk '{print $8}'`
     ACL_FILE=`grep "notice Read ACL file" temp.log | awk '{print $7}'`    
-    rm -rf temp.log
    ../qpidd -q --port $PORT
-   if test $ACL_FILE != "\"$PWD/policy.acl\""; then
+   if test "$ACL_FILE" != "\"$POLICY_FILE\""; then
      echo "unable to load policy file from an absolute path";
      return 1;
    fi
+   rm temp.log
 }
 
 if test -d ${PYTHON_DIR} ;  then
@@ -55,14 +55,10 @@ if test -d ${PYTHON_DIR} ;  then
     echo "Running acl tests using brokers on ports $LOCAL_PORT"
     PYTHONPATH=$PYTHON_DIR
     export PYTHONPATH
-    $srcdir/acl.py -v -s $srcdir/../../../specs/amqp.0-10-qpid-errata.xml -b localhost:$LOCAL_PORT --port $LOCAL_PORT
-    RETCODE=$?   
-    stop_brokers
-    test_loading_acl_from_absolute_path
-    RETCODE2=$?
+    $srcdir/acl.py -v -s $srcdir/../../../specs/amqp.0-10-qpid-errata.xml -b localhost:$LOCAL_PORT --port $LOCAL_PORT || EXITCODE=1
+    stop_brokers || EXITCODE=1
+    test_loading_acl_from_absolute_path || EXITCODE=1
     rm -rf $DATA_DIR
-    if test x$RETCODE != x0 -o x$RETCODE2 != x0; then 
-        echo "FAIL acl tests"; exit 1;
-    fi
+    exit $EXITCODE
 fi
 
-- 
cgit v1.2.1