You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2009/09/03 17:34:19 UTC
svn commit: r810998 - in /qpid/trunk/qpid/cpp/bindings/qmf: Makefile.am
python/Makefile.am tests/Makefile.am tests/run_interop_tests
Author: tross
Date: Thu Sep 3 15:34:19 2009
New Revision: 810998
URL: http://svn.apache.org/viewvc?rev=810998&view=rev
Log:
Improved automake for the qmf bindings.
- Added conditionals for HAVE_PYTHON_DEVEL
- Added conditionals in the run_interop_tests script to skip tests of unbuilt components
- Removed from distribution the code generated by swig for Python
Modified:
qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf/tests/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests
Modified: qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am?rev=810998&r1=810997&r2=810998&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am Thu Sep 3 15:34:19 2009
@@ -18,10 +18,16 @@
#
if HAVE_SWIG
-if HAVE_RUBY_DEVEL
EXTRA_DIST = qmfengine.i
-SUBDIRS = ruby python tests
+SUBDIRS = tests
+if HAVE_RUBY_DEVEL
+SUBDIRS += ruby
endif
+
+if HAVE_PYTHON_DEVEL
+SUBDIRS += python
+endif
+
endif
Modified: qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am?rev=810998&r1=810997&r2=810998&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am Thu Sep 3 15:34:19 2009
@@ -40,8 +40,7 @@
_qmfengine_la_LDFLAGS = -avoid-version -module -shared
_qmfengine_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs -lqpidclient $(top_builddir)/src/libqmfagent.la
_qmfengine_la_CXXFLAGS = $(INCLUDES) -I$(srcdir)/qmf -I$(PYTHON_INC)
-_qmfengine_la_SOURCES = \
- qmfengine.cpp
+nodist__qmfengine_la_SOURCES = qmfengine.cpp
CLEANFILES = $(generated_file_list)
Modified: qpid/trunk/qpid/cpp/bindings/qmf/tests/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/tests/Makefile.am?rev=810998&r1=810997&r2=810998&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/tests/Makefile.am Thu Sep 3 15:34:19 2009
@@ -18,4 +18,10 @@
#
TESTS = run_interop_tests
-EXTRA_DIST = run_interop_tests
+
+EXTRA_DIST = \
+ agent_ruby.rb \
+ python_agent.py \
+ python_console.py \
+ ruby_console.rb \
+ run_interop_tests
Modified: qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests?rev=810998&r1=810997&r2=810998&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests Thu Sep 3 15:34:19 2009
@@ -28,6 +28,9 @@
API_DIR=${BUILD_DIR}/bindings/qmf
SPEC_DIR=${QPID_DIR}/specs
+RUBY_LIB_DIR=${API_DIR}/ruby/.libs
+PYTHON_LIB_DIR=${API_DIR}/python/.libs
+
trap stop_broker INT TERM QUIT
start_broker() {
@@ -41,7 +44,7 @@
}
start_ruby_agent() {
- ruby -I${MY_DIR}/../ruby -I${API_DIR}/ruby/.libs ${MY_DIR}/agent_ruby.rb localhost $BROKER_PORT &
+ ruby -I${MY_DIR}/../ruby -I${RUBY_LIB_DIR} ${MY_DIR}/agent_ruby.rb localhost $BROKER_PORT &
AGENT_PID=$!
}
@@ -50,7 +53,7 @@
}
start_python_agent() {
- PYTHONPATH="${MY_DIR}/../python:${API_DIR}/python:${API_DIR}/python/.libs" python ${MY_DIR}/python_agent.py localhost $BROKER_PORT &
+ PYTHONPATH="${MY_DIR}/../python:${API_DIR}/python:${PYTHON_LIB_DIR}" python ${MY_DIR}/python_agent.py localhost $BROKER_PORT &
PY_AGENT_PID=$!
}
@@ -66,26 +69,30 @@
PYTHONPATH=${PYTHON_DIR}:${MY_DIR}
export PYTHONPATH
- echo " Python Agent (external storage) vs. Pure-Python Console"
- start_python_agent
- echo " Python agent started at pid $PY_AGENT_PID"
- ${PYTHON_DIR}/qpid-python-test -m python_console -b localhost:$BROKER_PORT $@
- RETCODE=$?
- stop_python_agent
- if test x$RETCODE != x0; then
- echo "FAIL qmf interop tests (Python Agent)";
- TESTS_FAILED=1
+ if test -d ${PYTHON_LIB_DIR} ; then
+ echo " Python Agent (external storage) vs. Pure-Python Console"
+ start_python_agent
+ echo " Python agent started at pid $PY_AGENT_PID"
+ ${PYTHON_DIR}/qpid-python-test -m python_console -b localhost:$BROKER_PORT $@
+ RETCODE=$?
+ stop_python_agent
+ if test x$RETCODE != x0; then
+ echo "FAIL qmf interop tests (Python Agent)";
+ TESTS_FAILED=1
+ fi
fi
- echo " Ruby Agent (external storage) vs. Pure-Python Console"
- start_ruby_agent
- echo " Ruby agent started at pid $AGENT_PID"
- ${PYTHON_DIR}/qpid-python-test -m python_console -b localhost:$BROKER_PORT $@
- RETCODE=$?
- stop_ruby_agent
- if test x$RETCODE != x0; then
- echo "FAIL qmf interop tests (Ruby Agent)";
- TESTS_FAILED=1
+ if test -d ${RUBY_LIB_DIR} ; then
+ echo " Ruby Agent (external storage) vs. Pure-Python Console"
+ start_ruby_agent
+ echo " Ruby agent started at pid $AGENT_PID"
+ ${PYTHON_DIR}/qpid-python-test -m python_console -b localhost:$BROKER_PORT $@
+ RETCODE=$?
+ stop_ruby_agent
+ if test x$RETCODE != x0; then
+ echo "FAIL qmf interop tests (Ruby Agent)";
+ TESTS_FAILED=1
+ fi
fi
# Also against the Pure-Python console:
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org