summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-05-14 20:49:00 +0000
committerAlan Conway <aconway@apache.org>2008-05-14 20:49:00 +0000
commit9f7850a4dd9dfdabc293a5961f0bbc862813a6d0 (patch)
tree9da6da5d9e3836de6bbf4d05046a7f109ecdfd1a /cpp
parentcea0eaf714ac743a40682fe4b0ad1f7f95b2be24 (diff)
downloadqpid-python-9f7850a4dd9dfdabc293a5961f0bbc862813a6d0.tar.gz
Fix example check in rpmbuild.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@656427 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/examples/Makefile.am2
-rwxr-xr-xcpp/examples/verify_all13
2 files changed, 7 insertions, 8 deletions
diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am
index ccf7bf66ae..b046540b92 100644
--- a/cpp/examples/Makefile.am
+++ b/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/cpp/examples/verify_all b/cpp/examples/verify_all
index 0fc1625355..9db2214903 100755
--- a/cpp/examples/verify_all
+++ b/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"