Author: aconway
Date: Thu Nov 30 23:36:35 2006
New Revision: 481175
URL: http://svn.apache.org/viewvc?view=rev&rev=481175
Log:
Buliding APR code, running python tests.
Removed:
incubator/qpid/trunk/qpid/cpp/tests/gen.mk
Modified:
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am
incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am
incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=481175&r1=481174&r2=481175
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Thu Nov 30 23:36:35 2006
@@ -31,7 +31,8 @@
yes|no) ;;
*) AC_MSG_ERROR([bad value ${enableval} for warnings option]) ;;
esac],
- [enableval=no])
+ [enableval=yes])
+
# Warnings: Enable as many as possible, keep the code clean. Please
# do not disable warnings or remove -Werror without discussing on
# qpid-dev list.
Modified: incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am?view=diff&rev=481175&r1=481174&r2=481175
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/broker/Makefile.am Thu Nov 30 23:36:35
2006
@@ -1,5 +1,6 @@
-AM_CXXFLAGS = $(WARNING_CFLAGS)
+AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1
INCLUDES = \
+ -I$(shell apr-1-config --includedir) \
-I$(top_srcdir)/gen \
-I$(top_srcdir)/lib/common \
-I$(top_srcdir)/lib/common/sys \
Modified: incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am?view=diff&rev=481175&r1=481174&r2=481175
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/client/Makefile.am Thu Nov 30 23:36:35
2006
@@ -1,5 +1,6 @@
-AM_CXXFLAGS = $(WARNING_CFLAGS)
+AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1
INCLUDES = \
+ -I$(shell apr-1-config --includedir) \
-I$(top_srcdir)/gen \
-I$(top_srcdir)/lib/common \
-I$(top_srcdir)/lib/common/sys \
Modified: incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am?view=diff&rev=481175&r1=481174&r2=481175
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am Thu Nov 30 23:36:35
2006
@@ -1,29 +1,44 @@
-AM_CXXFLAGS = $(WARNING_CFLAGS)
+AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1
+LIBS = -lapr-1
+
INCLUDES = \
+ -I$(shell apr-1-config --includedir) \
-I$(top_srcdir)/gen \
-I$(top_srcdir)/lib/common/sys \
-I$(top_srcdir)/lib/common/framing
-# This is a kludge to include the contents of the apr/ directory.
-# For now, we don't use it.
-EXTRA_DIST = \
- sys/apr/APRAcceptor.cpp \
- sys/apr/APRBase.cpp \
- sys/apr/APRBase.h \
- sys/apr/APRPool.cpp \
- sys/apr/APRPool.h \
- sys/apr/APRSocket.cpp \
- sys/apr/APRSocket.h \
- sys/apr/LFProcessor.cpp \
- sys/apr/LFProcessor.h \
- sys/apr/LFSessionContext.cpp \
- sys/apr/LFSessionContext.h \
- sys/apr/Socket.cpp \
- sys/apr/Thread.cpp
+apr = sys/apr
+apr_src = \
+ $(apr)/APRAcceptor.cpp \
+ $(apr)/APRBase.cpp \
+ $(apr)/APRBase.h \
+ $(apr)/APRPool.cpp \
+ $(apr)/APRPool.h \
+ $(apr)/APRSocket.cpp \
+ $(apr)/APRSocket.h \
+ $(apr)/LFProcessor.cpp \
+ $(apr)/LFProcessor.h \
+ $(apr)/LFSessionContext.cpp \
+ $(apr)/LFSessionContext.h \
+ $(apr)/Socket.cpp \
+ $(apr)/Thread.cpp
+
+posix = sys/posix
+posix_src = \
+ $(posix)/PosixAcceptor.cpp \
+ $(posix)/Socket.cpp \
+ $(posix)/Thread.cpp \
+ $(posix)/check.cpp \
+ $(posix)/check.h \
+ $(posix)/EventChannel.cpp \
+ $(posix)/EventChannel.h \
+ $(posix)/EventChannelThreads.cpp \
+ $(posix)/EventChannelThreads.h
+EXTRA_DIST=$(posix_src)
+platform_src = $(apr_src)
framing = framing
-posix = sys/posix
gen = $(srcdir)/../../gen
lib_LTLIBRARIES = libcommon.la
@@ -36,6 +51,7 @@
$(LIBTOOL_VERSION_INFO_ARG)
libcommon_la_SOURCES = \
+ $(platform_src) \
$(framing)/AMQBody.cpp \
$(framing)/AMQBody.h \
$(framing)/AMQContentBody.cpp \
@@ -75,15 +91,6 @@
$(gen)/AMQP_ClientProxy.cpp \
$(gen)/AMQP_MethodVersionMap.cpp \
$(gen)/AMQP_ServerProxy.cpp \
- $(posix)/PosixAcceptor.cpp \
- $(posix)/Socket.cpp \
- $(posix)/Thread.cpp \
- $(posix)/check.cpp \
- $(posix)/check.h \
- $(posix)/EventChannel.cpp \
- $(posix)/EventChannel.h \
- $(posix)/EventChannelThreads.cpp \
- $(posix)/EventChannelThreads.h \
Exception.cpp \
Exception.h \
ExceptionHolder.cpp \
Modified: incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/Makefile.am?view=diff&rev=481175&r1=481174&r2=481175
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/Makefile.am Thu Nov 30 23:36:35 2006
@@ -1,8 +1,9 @@
# TODO aconway 2006-11-30: nasty hack, should be done by automake?
abs_builddir = @abs_builddir@
-AM_CXXFLAGS = $(WARNING_CFLAGS)
+AM_CXXFLAGS = $(WARNING_CFLAGS) -DUSE_APR=1
INCLUDES = \
+ -I$(shell apr-1-config --includedir) \
-I$(top_srcdir)/gen \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/client \
@@ -62,16 +63,22 @@
unit_tests = \
$(broker_tests) \
$(framing_tests) \
- $(misc_tests) \
- $(posix_tests)
+ $(misc_tests)
+
noinst_PROGRAMS = $(client_tests)
-check: run-unit-tests
+check: run-unit-tests run-python-tests
.PHONY: run-unit-tests
run-unit-tests: $(check_LTLIBRARIES)
DllPlugInTester -c -b .libs/*.so
+
+# TODO aconway 2006-12-01: Should also check for qpidd.
+run-python-tests: $(check_LTLIBRARIES)
+ ../src/qpidd > qpidd.log 2>&1 &
+ cd ../../python ; ./run-tests -v -I cpp_failing.txt
+
include gen.mk
