diff options
| -rw-r--r-- | qpid/cpp/examples/Makefile.am | 2 | ||||
| -rwxr-xr-x | qpid/cpp/examples/verify_all | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/qpid/cpp/examples/Makefile.am b/qpid/cpp/examples/Makefile.am index ccf7bf66ae..b046540b92 100644 --- a/qpid/cpp/examples/Makefile.am +++ b/qpid/cpp/examples/Makefile.am @@ -70,4 +70,4 @@ endif # Verify the examples in the buid tree. check-local: all-local verify - $(srcdir)/verify_all $(abs_top_srcdir)/.. $(exclude_examples_regexp) + $(srcdir)/verify_all $(abs_top_srcdir)/.. $(top_builddir)/src/qpidd $(exclude_examples_regexp) diff --git a/qpid/cpp/examples/verify_all b/qpid/cpp/examples/verify_all index 0fc1625355..9db2214903 100755 --- a/qpid/cpp/examples/verify_all +++ b/qpid/cpp/examples/verify_all @@ -3,18 +3,17 @@ # verify=`dirname $0`/verify -topdir=$1 -exclude_regexp=$2 +topsrcdir=$1 +qpidd=$2 +exclude_regexp=$3 - -qpidd=$topdir/cpp/src/qpidd -python=$topdir/python +python=$topsrcdir/python trap "$qpidd -q" exit -export QPID_PORT=`$qpidd -dp0 --data-dir "" --auth no` +export QPID_PORT=`$qpidd -dp0 --data-dir "" --auth no` || { echo "Can't run qpidd" ; exit 1; } export PYTHON_EXAMPLES=$python/examples export PYTHONPATH=$python:$PYTHONPATH -export AMQP_SPEC=$topdir/specs/amqp.0-10.xml +export AMQP_SPEC=$topsrcdir/specs/amqp.0-10.xml test -d $PYTHON_EXAMPLES || echo "Warning: not verifying python examples, $PYTHON_EXAMPLES not found" find="find examples" |