diff options
| author | Alan Conway <aconway@apache.org> | 2008-02-12 21:39:55 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-02-12 21:39:55 +0000 |
| commit | da307a07138c7e8eeec6fb1a79efa6dd50f78862 (patch) | |
| tree | 2c7c5ebe9e862bacc9099b254de25e1fe9981cbd | |
| parent | dcf5de9575a3f2aa32b4e0aeefe0c116082adee5 (diff) | |
| download | qpid-python-da307a07138c7e8eeec6fb1a79efa6dd50f78862.tar.gz | |
Create a tar file of verify scripts suitable for untarring into and installed examples directory.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@627128 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/bin/verify (renamed from qpid/cpp/examples/verify) | 0 | ||||
| -rw-r--r-- | qpid/cpp/examples/Makefile.am | 5 | ||||
| -rwxr-xr-x | qpid/cpp/examples/verify_all | 14 |
3 files changed, 12 insertions, 7 deletions
diff --git a/qpid/cpp/examples/verify b/qpid/bin/verify index 844e99b765..844e99b765 100755 --- a/qpid/cpp/examples/verify +++ b/qpid/bin/verify diff --git a/qpid/cpp/examples/Makefile.am b/qpid/cpp/examples/Makefile.am index 3c896e2f68..6e696c1ab2 100644 --- a/qpid/cpp/examples/Makefile.am +++ b/qpid/cpp/examples/Makefile.am @@ -61,9 +61,8 @@ all-local: cd examples && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS) -I../../$(top_srcdir)/src -I../../$(top_srcdir)/src/gen -I../../$(top_builddir)/src/gen -L../../$(top_builddir)/src/.libs -Wl,-rpath,$(abs_top_builddir)/src/.libs" all # Verify the examples in the buid tree. -VERIFY=QPID_DATA_DIR= QPIDD=$(abs_top_builddir)/src/qpidd $(srcdir)/verify_all -check-local: all-local $(VERIFY_FILES) - PYTHON_EXAMPLES=$(abs_top_srcdir)/../python/examples $(srcdir)/verify_all $(srcdir)/verify $(top_builddir)/src/qpidd examples +check-local: all-local + $(srcdir)/verify_all $(abs_top_srcdir) $(abs_top_builddir) # TODO: # create a tarball for testing installed examples. diff --git a/qpid/cpp/examples/verify_all b/qpid/cpp/examples/verify_all index db1d6de783..3eb88c7718 100755 --- a/qpid/cpp/examples/verify_all +++ b/qpid/cpp/examples/verify_all @@ -1,13 +1,19 @@ #!/bin/sh # Verify all C++/python example combinations. # -verify=$1; shift -qpidd=$1; shift -cpp=$1; shift + +src=$1 ; build=$2 + +verify=$src/../bin/verify +qpidd=$build/src/qpidd +cpp=$build/examples/examples +python=$src/../python trap "$qpidd -q" exit export QPID_PORT=`$qpidd -dp0 --data-dir ""` -export PYTHON_EXAMPLES +export PYTHON_EXAMPLES=$python/examples +export PYTHONPATH=$python:$PYTHONPATH +export AMQP_SPEC=$src/../specs/amqp.0-10-preview.xml find="find $cpp" test -d $PYTHON_EXAMPLES && find="$find $PYTHON_EXAMPLES" |