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 2010/03/09 18:20:16 UTC
svn commit: r920991 - in /qpid/trunk/qpid/cpp: configure.ac
src/tests/Makefile.am src/tests/testagent.cpp src/tests/testagent.mk
src/tests/testagent.xml src/tests/testagent/Makefile.am
src/tests/testagent/schema.xml src/tests/testagent/testagent.cpp
Author: aconway
Date: Tue Mar 9 17:20:15 2010
New Revision: 920991
URL: http://svn.apache.org/viewvc?rev=920991&view=rev
Log:
Remove tests/testagent sub-directory, build testagent in the tests directory.
Resolves build-order issues, more consistent with the rest of the test builds.
Added:
qpid/trunk/qpid/cpp/src/tests/testagent.cpp
- copied, changed from r920545, qpid/trunk/qpid/cpp/src/tests/testagent/testagent.cpp
qpid/trunk/qpid/cpp/src/tests/testagent.mk
qpid/trunk/qpid/cpp/src/tests/testagent.xml
- copied, changed from r920545, qpid/trunk/qpid/cpp/src/tests/testagent/schema.xml
Removed:
qpid/trunk/qpid/cpp/src/tests/testagent/Makefile.am
qpid/trunk/qpid/cpp/src/tests/testagent/schema.xml
qpid/trunk/qpid/cpp/src/tests/testagent/testagent.cpp
Modified:
qpid/trunk/qpid/cpp/configure.ac
qpid/trunk/qpid/cpp/src/tests/Makefile.am
Modified: qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=920991&r1=920990&r2=920991&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Tue Mar 9 17:20:15 2010
@@ -534,7 +534,6 @@ AC_CONFIG_FILES([
src/Makefile
src/tests/Makefile
src/tests/test_env.sh
- src/tests/testagent/Makefile
docs/man/Makefile
docs/api/Makefile
docs/api/user.doxygen
Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=920991&r1=920990&r2=920991&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Tue Mar 9 17:20:15 2010
@@ -17,8 +17,6 @@
# under the License.
#
-SUBDIRS = . testagent
-
AM_CXXFLAGS = $(WARNING_CFLAGS) -DBOOST_TEST_DYN_LINK
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
PUBLIC_INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include # Use public API only
@@ -381,3 +379,5 @@ python_prep:
--prefix=$(PYTHON_BLD_DIR) --install-lib=$(PYTHON_BLD_DIR) \
--install-scripts=$(PYTHON_BLD_DIR)/commands; \
else echo "WARNING: python client not built, missing $(PYTHON_SRC_DIR)"; fi
+
+include testagent.mk
Copied: qpid/trunk/qpid/cpp/src/tests/testagent.cpp (from r920545, qpid/trunk/qpid/cpp/src/tests/testagent/testagent.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/testagent.cpp?p2=qpid/trunk/qpid/cpp/src/tests/testagent.cpp&p1=qpid/trunk/qpid/cpp/src/tests/testagent/testagent.cpp&r1=920545&r2=920991&rev=920991&view=diff
==============================================================================
(empty)
Added: qpid/trunk/qpid/cpp/src/tests/testagent.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/testagent.mk?rev=920991&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/testagent.mk (added)
+++ qpid/trunk/qpid/cpp/src/tests/testagent.mk Tue Mar 9 17:20:15 2010
@@ -0,0 +1,50 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Build a simple qmf agent for test purposes.
+
+QMF_GEN=$(top_srcdir)/managementgen/qmf-gen
+
+TESTAGENT_GEN_SRC= \
+ testagent_gen/qmf/org/apache/qpid/agent/example/Parent.h \
+ testagent_gen/qmf/org/apache/qpid/agent/example/Child.h \
+ testagent_gen/qmf/org/apache/qpid/agent/example/Parent.cpp \
+ testagent_gen/qmf/org/apache/qpid/agent/example/Child.cpp \
+ testagent_gen/qmf/org/apache/qpid/agent/example/ArgsParentCreate_child.h \
+ testagent_gen/qmf/org/apache/qpid/agent/example/EventChildCreated.h \
+ testagent_gen/qmf/org/apache/qpid/agent/example/EventChildDestroyed.h \
+ testagent_gen/qmf/org/apache/qpid/agent/example/EventChildCreated.cpp \
+ testagent_gen/qmf/org/apache/qpid/agent/example/EventChildDestroyed.cpp \
+ testagent_gen/qmf/org/apache/qpid/agent/example/Package.h \
+ testagent_gen/qmf/org/apache/qpid/agent/example/Package.cpp
+
+$(TESTAGENT_GEN_SRC): testagent_gen.timestamp
+
+testagent_gen.timestamp: testagent.xml
+ $(QMF_GEN) -o testagent_gen/qmf $(srcdir)/testagent.xml
+ touch testagent_gen.timestamp
+
+CLEANFILES+=$(TESTAGENT_GEN_SRC) testagent_gen.timestamp
+
+qpidtest_PROGRAMS+=testagent
+testagent_CXXFLAGS=$(CXXFLAGS) -Itestagent_gen
+testagent_SOURCES=testagent.cpp $(TESTAGENT_GEN_SRC)
+testagent_LDADD=$(top_builddir)/src/libqmf.la
+
+EXTRA_DIST+=testagent.xml
Copied: qpid/trunk/qpid/cpp/src/tests/testagent.xml (from r920545, qpid/trunk/qpid/cpp/src/tests/testagent/schema.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/testagent.xml?p2=qpid/trunk/qpid/cpp/src/tests/testagent.xml&p1=qpid/trunk/qpid/cpp/src/tests/testagent/schema.xml&r1=920545&r2=920991&rev=920991&view=diff
==============================================================================
(empty)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org