summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-02-04 17:16:51 +0000
committerAlan Conway <aconway@apache.org>2009-02-04 17:16:51 +0000
commit81568b291ee10ddc6b980aeedf44346306570b30 (patch)
treeafd4771b51dc5cff476651aa7d60cda90eccc2cb /qpid/cpp/src
parent4c7d48ef9f19a32cc5bd28eb61b55c7a749e7812 (diff)
downloadqpid-python-81568b291ee10ddc6b980aeedf44346306570b30.tar.gz
Fixed run_acl_tests.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@740801 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rwxr-xr-xqpid/cpp/src/tests/run_acl_tests5
1 files changed, 2 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/run_acl_tests b/qpid/cpp/src/tests/run_acl_tests
index 4270e6545e..88de5f33fc 100755
--- a/qpid/cpp/src/tests/run_acl_tests
+++ b/qpid/cpp/src/tests/run_acl_tests
@@ -38,9 +38,8 @@ stop_brokers() {
test_loading_acl_from_absolute_path(){
POLICY_FILE=$PWD/$srcdir/policy.acl
rm -f temp.log
- ../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}'`
+ PORT=`../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`
+ ACL_FILE=`grep "notice Read ACL file" temp.log | awk '{print $5x}'`
../qpidd -q --port $PORT
if test "$ACL_FILE" != "\"$POLICY_FILE\""; then
echo "unable to load policy file from an absolute path";