You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/09/30 21:47:54 UTC
svn commit: r451650 - in
/incubator/activemq/activemq-cpp/trunk/activemq-cpp: Makefile.am
configure.ac src/main/Makefile.am src/test-integration/Makefile.am
src/test/Makefile.am
Author: chirino
Date: Sat Sep 30 12:47:53 2006
New Revision: 451650
URL: http://svn.apache.org/viewvc?view=rev&rev=451650
Log:
Added the unit test and integration test modules to the automake build system.
Added:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am
incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am?view=diff&rev=451650&r1=451649&r2=451650
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/Makefile.am Sat Sep 30 12:47:53 2006
@@ -2,10 +2,10 @@
AUTOMAKE_OPTIONS = foreign
#Build in these directories:
-SUBDIRS = src/main src/examples
+SUBDIRS = src/main src/examples src/test src/test-integration
#Distribute these directories:
-DIST_SUBDIRS = src/main src/examples
+DIST_SUBDIRS = src/main
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = activemq-cpp.pc
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac?view=diff&rev=451650&r1=451649&r2=451650
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/configure.ac Sat Sep 30 12:47:53 2006
@@ -62,15 +62,8 @@
AC_CHECK_HEADERS([uuid/uuid.h])
AC_CHECK_HEADERS([objbase.h])
AC_CHECK_HEADERS([repcdce.h])
-##AC_CHECK_HEADERS([Winsock2.h])
-#save_LIBS="${LIBS}"
-#AC_CHECK_LIB(rt, clock_gettime, [rt_libs=" -lrt"])
-#LIBS="${LIBS}${rt_libs}"
-#DLL_LIBS="${DLL_LIBS}${rt_libs}"
-#AC_CHECK_FUNCS([clock_gettime nanosleep])
-#LIBS="${save_LIBS}"
-## AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
+AM_PATH_CPPUNIT(1.10.2, cppunit=yes, cppunit=no) ## AC_MSG_ERROR([cppunit required for build.]))
case "${host_os}" in
@@ -98,10 +91,17 @@
## Generates Makefile's, configuration files and scripts
## -----------------------------------------------------
-AC_OUTPUT(\
- Makefile \
- activemq-cpp.pc \
- src/main/Makefile \
- src/examples/Makefile \
-)
+AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES(activemq-cpp.pc)
+AC_CONFIG_FILES(src/main/Makefile)
+AC_CONFIG_FILES(src/examples/Makefile)
+
+if test x$cppunit = xyes
+then
+ AC_CONFIG_FILES(src/test/Makefile)
+ AC_CONFIG_FILES(src/test-integration/Makefile)
+else
+ AC_MSG_WARN(cppunit not found, unit and itegration tests will not be built)
+fi
+AC_OUTPUT
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am?view=diff&rev=451650&r1=451649&r2=451650
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am Sat Sep 30 12:47:53 2006
@@ -222,7 +222,7 @@
## Compiler / Linker Info
##
-INCLUDES = -I$(srcdir)
+#INCLUDES = -I$(srcdir)
lib_LTLIBRARIES= libactivemq-cpp.la
libactivemq_cpp_la_SOURCES= $(h_sources) $(cc_sources)
libactivemq_cpp_la_LDFLAGS= -version-info $(ACTIVEMQ_LIBRARY_VERSION) -release $(ACTIVEMQ_VERSION)
Added: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am?view=auto&rev=451650
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am (added)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/Makefile.am Sat Sep 30 12:47:53 2006
@@ -0,0 +1,19 @@
+cc_sources = \
+ integration/common/AbstractTester.cpp \
+ integration/common/IntegrationCommon.cpp \
+ integration/durable/DurableTester.cpp \
+ integration/simple/SimpleTester.cpp \
+ integration/transactional/TransactionTester.cpp \
+ integration/various/SimpleRollbackTest.cpp \
+ main.cpp
+
+## Compile this as part of make check
+check_PROGRAMS = activemq-test-integration
+
+##
+## Compiler/Linker Options
+##
+activemq_test_integration_SOURCES = $(cc_sources)
+activemq_test_integration_CXXFLAGS = -I$(srcdir)/../main @CPPUNIT_CFLAGS@
+activemq_test_integration_LDADD= ../main/libactivemq-cpp.la @CPPUNIT_LIBS@
+
Added: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am?view=auto&rev=451650
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am (added)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/Makefile.am Sat Sep 30 12:47:53 2006
@@ -0,0 +1,66 @@
+cc_sources = \
+ activemq/concurrent/MutexTest.cpp \
+ activemq/concurrent/ThreadPoolTest.cpp \
+ activemq/concurrent/ThreadTest.cpp \
+ activemq/connector/ConnectorFactoryMapRegistrarTest.cpp \
+ activemq/connector/ConnectorFactoryMapTest.cpp \
+ activemq/connector/stomp/commands/AbortCommandTest.cpp \
+ activemq/connector/stomp/commands/AckCommandTest.cpp \
+ activemq/connector/stomp/commands/BeginCommandTest.cpp \
+ activemq/connector/stomp/commands/BytesMessageCommandTest.cpp \
+ activemq/connector/stomp/commands/CommandConstantsTest.cpp \
+ activemq/connector/stomp/commands/CommitCommandTest.cpp \
+ activemq/connector/stomp/commands/ConnectCommandTest.cpp \
+ activemq/connector/stomp/commands/ConnectedCommandTest.cpp \
+ activemq/connector/stomp/commands/DisconnectCommandTest.cpp \
+ activemq/connector/stomp/commands/ErrorCommandTest.cpp \
+ activemq/connector/stomp/commands/MessageCommandTest.cpp \
+ activemq/connector/stomp/commands/ReceiptCommandTest.cpp \
+ activemq/connector/stomp/commands/SubscribeCommandTest.cpp \
+ activemq/connector/stomp/commands/TextMessageCommandTest.cpp \
+ activemq/connector/stomp/commands/UnsubscribeCommandTest.cpp \
+ activemq/connector/stomp/marshal/MarshalerTest.cpp \
+ activemq/connector/stomp/StompCommandReaderTest.cpp \
+ activemq/connector/stomp/StompCommandWriterTest.cpp \
+ activemq/connector/stomp/StompConnectorTest.cpp \
+ activemq/connector/stomp/StompFrameTest.cpp \
+ activemq/connector/stomp/StompSessionManagerTest.cpp \
+ activemq/core/ActiveMQConnectionFactoryTest.cpp \
+ activemq/core/ActiveMQConnectionTest.cpp \
+ activemq/core/ActiveMQDestinationTest.cpp \
+ activemq/core/ActiveMQSessionTest.cpp \
+ activemq/exceptions/ActiveMQExceptionTest.cpp \
+ activemq/io/BufferedInputStreamTest.cpp \
+ activemq/io/BufferedOutputStreamTest.cpp \
+ activemq/io/ByteArrayInputStreamTest.cpp \
+ activemq/io/ByteArrayOutputStreamTest.cpp \
+ activemq/io/EndianReaderTest.cpp \
+ activemq/io/EndianWriterTest.cpp \
+ activemq/logger/LoggerTest.cpp \
+ activemq/network/SocketFactoryTest.cpp \
+ activemq/network/SocketTest.cpp \
+ activemq/transport/DummyTransportFactory.cpp \
+ activemq/transport/IOTransportTest.cpp \
+ activemq/transport/ResponseCorrelatorTest.cpp \
+ activemq/transport/TransportFactoryMapRegistrarTest.cpp \
+ activemq/transport/TransportFactoryMapTest.cpp \
+ activemq/util/BooleanTest.cpp \
+ activemq/util/GuidTest.cpp \
+ activemq/util/IntegerTest.cpp \
+ activemq/util/LongTest.cpp \
+ activemq/util/QueueTest.cpp \
+ activemq/util/StringTokenizerTest.cpp \
+ main.cpp
+
+## Compile this as part of make check
+check_PROGRAMS = activemq-test
+## Also run the tests as part of make check
+TESTS = $(check_PROGRAMS)
+
+##
+## Compiler/Linker Options
+##
+activemq_test_SOURCES = $(cc_sources)
+activemq_test_CXXFLAGS = -I$(srcdir)/../main @CPPUNIT_CFLAGS@
+activemq_test_LDADD= ../main/libactivemq-cpp.la @CPPUNIT_LIBS@
+