Author: aconway
Date: Thu Feb 21 06:24:24 2008
New Revision: 629796
URL: http://svn.apache.org/viewvc?rev=629796&view=rev
Log:
Fix verify script problem
Added:
incubator/qpid/trunk/qpid/cpp/examples/verify
- copied unchanged from r629791, incubator/qpid/trunk/qpid/bin/verify
Removed:
incubator/qpid/trunk/qpid/bin/verify
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=629796&r1=629795&r2=629796&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Thu Feb 21 06:24:24 2008
@@ -44,12 +44,6 @@
EXTRA_DIST=$(nobase_pkgdata_DATA) $(VERIFY_FILES)
-force:
-
-VERIFY_SCRIPT=$(top_srcdir)/../bin/verify
-verify: force
- if [ -f $(VERIFY_SCRIPT) ] ; then cp $(VERIFY_SCRIPT) $@; fi
-
# Note: we don't use normal automake SUBDIRS because the example
# makefiles don't understand all the recursive automake targets.
@@ -67,7 +61,7 @@
# Verify the examples in the buid tree.
check-local: all-local verify
- $(srcdir)/verify_all $(abs_top_srcdir) $(abs_top_builddir)
+ $(srcdir)/verify_all $(abs_top_srcdir)/..
# TODO:
# create a tarball for testing installed examples.
Modified: incubator/qpid/trunk/qpid/cpp/examples/verify_all
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/verify_all?rev=629796&r1=629795&r2=629796&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/verify_all (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/verify_all Thu Feb 21 06:24:24 2008
@@ -2,20 +2,19 @@
# Verify all C++/python example combinations.
#
-src=$1 ; build=$2
-
-verify=./verify
-qpidd=$build/src/qpidd
-cpp=$build/examples/examples
-python=$src/../python
+srcdir=$1 ;
+verify=`dirname $0`/verify
+qpidd=../src/qpidd
+python=$srcdir/python
trap "$qpidd -q" exit
export QPID_PORT=`$qpidd -dp0 --data-dir ""`
export PYTHON_EXAMPLES=$python/examples
export PYTHONPATH=$python:$PYTHONPATH
-export AMQP_SPEC=$src/../specs/amqp.0-10-preview.xml
+export AMQP_SPEC=$srcdir/specs/amqp.0-10-preview.xml
-find="find $cpp"
+test -d $PYTHON_EXAMPLES || echo "Warning: not verifying python examples,
$PYTHON_EXAMPLES not found"
+find="find examples"
test -d $PYTHON_EXAMPLES && find="$find $PYTHON_EXAMPLES"
find="$find -name verify"
test -d $PYTHON_EXAMPLES && \
