diff options
| author | Alan Conway <aconway@apache.org> | 2009-11-30 19:34:36 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-11-30 19:34:36 +0000 |
| commit | 7a70ee7193a85ceb52cbfe3df2684e947cee9456 (patch) | |
| tree | 3f8c78519d4169bc7c0ec8015a684879527a5350 /cpp/src/tests/run_acl_tests | |
| parent | d3e2aeef6229259be003071988706c934677ff43 (diff) | |
| download | qpid-python-7a70ee7193a85ceb52cbfe3df2684e947cee9456.tar.gz | |
Clean up test environment variables, prepare for running more tests in cmake.
- consolidate test env vars in test_env.sh, also useful from command line.
- generate test_env.sh with autoconf/cmake to cover library location differences.
- Remove explicit mention of .libs, use $QPID_MODULE_DIR to load modules.
- Fix run_test to run valgrind under cmake
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@885557 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/run_acl_tests')
| -rwxr-xr-x | cpp/src/tests/run_acl_tests | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/tests/run_acl_tests b/cpp/src/tests/run_acl_tests index c67e2d421d..0cefff2958 100755 --- a/cpp/src/tests/run_acl_tests +++ b/cpp/src/tests/run_acl_tests @@ -20,13 +20,13 @@ # # Run the acl tests. $srcdir is set by the Makefile. -. `dirname $0`/python_env.sh +source ./test_env.sh DATA_DIR=`pwd`/data_dir trap stop_brokers INT TERM QUIT start_brokers() { - ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIR --load-module ../.libs/acl.so --acl-file policy.acl --auth no > qpidd.port + ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIR --load-module $QPID_MODULE_DIR/acl.so --acl-file policy.acl --auth no > qpidd.port LOCAL_PORT=`cat qpidd.port` } @@ -35,9 +35,9 @@ stop_brokers() { } test_loading_acl_from_absolute_path(){ - POLICY_FILE=$PWD/$srcdir/policy.acl + POLICY_FILE=$srcdir/policy.acl rm -f temp.log - 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` + PORT=`../qpidd --daemon --port 0 --no-module-dir --no-data-dir --auth no --load-module $QPID_MODULE_DIR/acl.so --acl-file $POLICY_FILE -t --log-to-file temp.log 2>/dev/null` ACL_FILE=`grep "notice Read ACL file" temp.log | sed 's/^.*Read ACL file //'` ../qpidd -q --port $PORT if test "$ACL_FILE" != "\"$POLICY_FILE\""; then @@ -55,7 +55,7 @@ if test -d ${PYTHON_DIR} ; then echo "Running acl tests using brokers on ports $LOCAL_PORT" PYTHONPATH=$PYTHON_DIR:$srcdir export PYTHONPATH - $PYTHON_COMMANDS/qpid-python-test -b localhost:$LOCAL_PORT -m acl || EXITCODE=1 + $QPID_PYTHON_TEST -b localhost:$LOCAL_PORT -m acl || EXITCODE=1 stop_brokers || EXITCODE=1 test_loading_acl_from_absolute_path || EXITCODE=1 rm -rf $DATA_DIR |