Author: aconway
Date: Wed May 14 13:49:00 2008
New Revision: 656427
URL: http://svn.apache.org/viewvc?rev=656427&view=rev
Log:
Fix example check in rpmbuild.
Modified:
incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
incubator/qpid/trunk/qpid/cpp/examples/verify_all
Modified: incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=656427&r1=656426&r2=656427&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Wed May 14 13:49:00 2008
@@ -70,4 +70,4 @@
# 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)
Modified: incubator/qpid/trunk/qpid/cpp/examples/verify_all
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/verify_all?rev=656427&r1=656426&r2=656427&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/verify_all (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/verify_all Wed May 14 13:49:00 2008
@@ -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"
