You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2008/02/12 22:39:57 UTC

svn commit: r627128 - in /incubator/qpid/trunk/qpid: bin/verify cpp/examples/Makefile.am cpp/examples/verify cpp/examples/verify_all

Author: aconway
Date: Tue Feb 12 13:39:55 2008
New Revision: 627128

URL: http://svn.apache.org/viewvc?rev=627128&view=rev
Log:
Create a tar file of verify scripts suitable for untarring into and installed examples directory.

Added:
    incubator/qpid/trunk/qpid/bin/verify
      - copied unchanged from r620860, incubator/qpid/trunk/qpid/cpp/examples/verify
Removed:
    incubator/qpid/trunk/qpid/cpp/examples/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=627128&r1=627127&r2=627128&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Tue Feb 12 13:39:55 2008
@@ -61,9 +61,8 @@
 	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.

Modified: incubator/qpid/trunk/qpid/cpp/examples/verify_all
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/verify_all?rev=627128&r1=627127&r2=627128&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/verify_all (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/verify_all Tue Feb 12 13:39:55 2008
@@ -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"