qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r729935 - /qpid/trunk/qpid/cpp/src/tests/run_acl_tests
Date Mon, 29 Dec 2008 16:42:33 GMT
Author: aconway
Date: Mon Dec 29 08:42:33 2008
New Revision: 729935

URL: http://svn.apache.org/viewvc?rev=729935&view=rev
Log:
Fixed to run correctly in VPATH build.

Modified:
    qpid/trunk/qpid/cpp/src/tests/run_acl_tests

Modified: qpid/trunk/qpid/cpp/src/tests/run_acl_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_acl_tests?rev=729935&r1=729934&r2=729935&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_acl_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_acl_tests Mon Dec 29 08:42:33 2008
@@ -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 @@
 }
 
 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 @@
     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
 



Mime
View raw message