diff options
| author | Alan Conway <aconway@apache.org> | 2008-02-21 14:24:24 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-02-21 14:24:24 +0000 |
| commit | e94f3d432e52caa93244bcbca57d58bee570041d (patch) | |
| tree | 41de5e5b5b985c448c6592383598674490354f05 | |
| parent | a0551acfe22a99433db840b246a56edb48f6f06e (diff) | |
| download | qpid-python-e94f3d432e52caa93244bcbca57d58bee570041d.tar.gz | |
Fix verify script problem
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@629796 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/examples/Makefile.am | 8 | ||||
| -rwxr-xr-x | qpid/cpp/examples/verify (renamed from qpid/bin/verify) | 0 | ||||
| -rwxr-xr-x | qpid/cpp/examples/verify_all | 15 |
3 files changed, 8 insertions, 15 deletions
diff --git a/qpid/cpp/examples/Makefile.am b/qpid/cpp/examples/Makefile.am index df7fe4dfc7..21363ea8e4 100644 --- a/qpid/cpp/examples/Makefile.am +++ b/qpid/cpp/examples/Makefile.am @@ -44,12 +44,6 @@ VERIFY_FILES= verify verify_all \ 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 @@ all-local: # 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. diff --git a/qpid/bin/verify b/qpid/cpp/examples/verify index 251097930e..251097930e 100755 --- a/qpid/bin/verify +++ b/qpid/cpp/examples/verify diff --git a/qpid/cpp/examples/verify_all b/qpid/cpp/examples/verify_all index e6d75929b2..5501239021 100755 --- a/qpid/cpp/examples/verify_all +++ b/qpid/cpp/examples/verify_all @@ -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 && \ |