qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r656326 - in /incubator/qpid/trunk/qpid/cpp/examples: Makefile.am verify_all
Date Wed, 14 May 2008 16:24:09 GMT
Author: aconway
Date: Wed May 14 09:24:08 2008
New Revision: 656326

URL: http://svn.apache.org/viewvc?rev=656326&view=rev
Log:
Exclude XML example checks if XML support is not available.

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=656326&r1=656325&r2=656326&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Wed May 14 09:24:08 2008
@@ -64,18 +64,10 @@
 	test -d examples || cp -R $(srcdir)/examples .
 	cd examples && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS) -I$(abs_top_srcdir)/src
-I$(abs_top_srcdir)/src/gen -I$(abs_top_builddir)/src -I$(abs_top_builddir)/src/gen -L$(abs_top_builddir)/src/.libs
-Wl,-rpath,$(abs_top_builddir)/src/.libs" all
 
+if !HAVE_XML
+exclude_examples_regexp="xml"	# Exclude XML examples.
+endif
+
 # Verify the examples in the buid tree.
 check-local: all-local verify
 	$(srcdir)/verify_all $(abs_top_srcdir)/..
-
-# TODO:
-#  create a tarball for testing installed examples.
-#  installcheck-local to use the tarball on installed example and clean up after.
-# Build and verify installed C++ examples, clean up to avoid rpmbuild warnings.
-# EXAMPLE_FLAGS=-I$(DESTDIR)$(includedir) -L$(DESTDIR)$(libdir) -Wl,-rpath,$(DESTDIR)$(libdir)
-# EXAMPLE_DIR=$(DESTDIR)$(pkgdatadir)/examples/cpp 
-# installcheck-local:
-# 	cd $(EXAMPLE_DIR) && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(EXAMPLE_FLAGS)" all
-# 	cd $(EXAMPLE_DIR) && QPIDD=$(sbindir)/qpidd $(srcdir)/verify *
-# 	cd $(EXAMPLE_DIR) && $(MAKE) clean
-

Modified: incubator/qpid/trunk/qpid/cpp/examples/verify_all
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/verify_all?rev=656326&r1=656325&r2=656326&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/verify_all (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/verify_all Wed May 14 09:24:08 2008
@@ -2,16 +2,19 @@
 # Verify all C++/python example combinations.
 #
 
-srcdir=$1 ;
 verify=`dirname $0`/verify
-qpidd=../src/qpidd
-python=$srcdir/python
- 
+topdir=$1 
+exclude_regexp=$2
+
+
+qpidd=$topdir/cpp/src/qpidd
+python=$topdir/python
+
 trap "$qpidd -q" exit
 export QPID_PORT=`$qpidd -dp0 --data-dir "" --auth no`
 export PYTHON_EXAMPLES=$python/examples
 export PYTHONPATH=$python:$PYTHONPATH
-export AMQP_SPEC=$srcdir/specs/amqp.0-10.xml
+export AMQP_SPEC=$topdir/specs/amqp.0-10.xml
 
 test -d $PYTHON_EXAMPLES || echo "Warning: not verifying python examples, $PYTHON_EXAMPLES
not found"
 find="find examples"
@@ -19,5 +22,13 @@
 find="$find -name verify"
 test -d $PYTHON_EXAMPLES && \
     find="$find -o -name verify_cpp_python -o -name verify_python_cpp"
-$verify `$find`
+all_examples=`$find`
 
+if test -z "$exclude_regexp"; then
+    run_examples=$all_examples
+else
+    for f in $all_examples; do
+	{ cat $f | grep $exclude_regexp > /dev/null ; } || run_examples="$run_examples $f"
+    done
+fi
+$verify $run_examples



Mime
View raw message