Author: afester
Date: Wed Dec 21 08:36:07 2005
New Revision: 358314
URL: http://svn.apache.org/viewcvs?rev=358314&view=rev
Log:
LOGCXX-92: remove non-portable linker flags --whole-archive from test suite
Removed:
logging/log4cxx/trunk/tests/src/customlogger/Makefile.am
logging/log4cxx/trunk/tests/src/db/Makefile.am
logging/log4cxx/trunk/tests/src/defaultinit/Makefile.am
logging/log4cxx/trunk/tests/src/helpers/Makefile.am
logging/log4cxx/trunk/tests/src/net/Makefile.am
logging/log4cxx/trunk/tests/src/nt/Makefile.am
logging/log4cxx/trunk/tests/src/pattern/Makefile.am
logging/log4cxx/trunk/tests/src/rolling/Makefile.am
logging/log4cxx/trunk/tests/src/util/Makefile.am
logging/log4cxx/trunk/tests/src/varia/Makefile.am
logging/log4cxx/trunk/tests/src/xml/Makefile.am
Modified:
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/tests/src/Makefile.am
Modified: logging/log4cxx/trunk/configure.in
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/configure.in?rev=358314&r1=358313&r2=358314&view=diff
==============================================================================
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Wed Dec 21 08:36:07 2005
@@ -438,17 +438,6 @@
tests/input/rolling/Makefile
tests/input/xml/Makefile
tests/src/Makefile
-tests/src/customlogger/Makefile
-tests/src/db/Makefile
-tests/src/defaultinit/Makefile
-tests/src/helpers/Makefile
-tests/src/net/Makefile
-tests/src/nt/Makefile
-tests/src/pattern/Makefile
-tests/src/rolling/Makefile
-tests/src/util/Makefile
-tests/src/xml/Makefile
-tests/src/varia/Makefile
tests/witness/Makefile
tests/witness/encoding/Makefile
tests/witness/ndc/Makefile
Modified: logging/log4cxx/trunk/tests/src/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/Makefile.am?rev=358314&r1=358313&r2=358314&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/Makefile.am Wed Dec 21 08:36:07 2005
@@ -1,7 +1,11 @@
-SUBDIRS = customlogger defaultinit helpers net pattern rolling util varia db
xml nt
-
-EXTRA_DIST = $(top_srcdir)/tests/src/*.cpp
-noinst_HEADERS= $(top_srcdir)/tests/src/*.h
+noinst_HEADERS = \
+ $(top_srcdir)/tests/src/customlogger/*.h \
+ $(top_srcdir)/tests/src/helpers/*.h \
+ $(top_srcdir)/tests/src/net/*.h \
+ $(top_srcdir)/tests/src/pattern/*.h \
+ $(top_srcdir)/tests/src/util/*.h \
+ $(top_srcdir)/tests/src/xml/*.h \
+ $(top_srcdir)/tests/src/*.h
if TESTS
@@ -9,7 +13,103 @@
noinst_PROGRAMS = testsuite shortsocketserver
+customlogger_tests = \
+ customlogger/xlogger.cpp\
+ customlogger/xloggertestcase.cpp
+
+defaultinit_tests = \
+ defaultinit/testcase1.cpp\
+ defaultinit/testcase2.cpp\
+ defaultinit/testcase3.cpp\
+ defaultinit/testcase4.cpp
+
+helpers = \
+ helpers/absolutetimedateformattestcase.cpp \
+ helpers/cacheddateformattestcase.cpp \
+ helpers/charsetdecodertestcase.cpp \
+ helpers/charsetencodertestcase.cpp \
+ helpers/cyclicbuffertestcase.cpp\
+ helpers/datetimedateformattestcase.cpp \
+ helpers/iso8601dateformattestcase.cpp \
+ helpers/localechanger.cpp\
+ helpers/optionconvertertestcase.cpp \
+ helpers/propertiestestcase.cpp \
+ helpers/relativetimedateformattestcase.cpp \
+ helpers/stringtokenizertestcase.cpp \
+ helpers/stringhelpertestcase.cpp \
+ helpers/timezonetestcase.cpp \
+ helpers/transcodertestcase.cpp \
+ helpers/unicodehelpertestcase.cpp
+
+net_tests = \
+ net/smtpappendertestcase.cpp \
+ net/socketappendertestcase.cpp \
+ net/sockethubappendertestcase.cpp \
+ net/socketservertestcase.cpp \
+ net/syslogappendertestcase.cpp \
+ net/telnetappendertestcase.cpp \
+ net/xmlsocketappendertestcase.cpp
+
+pattern_tests = \
+ pattern/num343patternconverter.cpp \
+ pattern/patternparsertestcase.cpp
+
+rolling_tests = \
+ rolling/filenamepatterntestcase.cpp \
+ rolling/filterbasedrollingtest.cpp \
+ rolling/manualrollingtest.cpp \
+ rolling/obsoletedailyrollingfileappendertest.cpp \
+ rolling/obsoleterollingfileappendertest.cpp \
+ rolling/sizebasedrollingtest.cpp \
+ rolling/timebasedrollingtest.cpp
+
+util = \
+ util/absolutetimefilter.cpp\
+ util/absolutedateandtimefilter.cpp\
+ util/binarycompare.cpp\
+ util/compare.cpp\
+ util/controlfilter.cpp\
+ util/filenamefilter.cpp \
+ util/filter.cpp\
+ util/iso8601filter.cpp\
+ util/linenumberfilter.cpp\
+ util/relativetimefilter.cpp\
+ util/threadfilter.cpp\
+ util/transformer.cpp\
+ util/xmlfilenamefilter.cpp \
+ util/xmllineattributefilter.cpp\
+ util/xmltimestampfilter.cpp \
+ util/xmlthreadfilter.cpp
+
+varia_tests = \
+ varia/errorhandlertestcase.cpp \
+ varia/levelmatchfiltertestcase.cpp \
+ varia/levelrangefiltertestcase.cpp
+
+db_tests = \
+ db/odbcappendertestcase.cpp
+
+xml_tests = \
+ xml/customleveltestcase.cpp \
+ xml/domtestcase.cpp \
+ xml/xlevel.cpp \
+ xml/xmllayouttestcase.cpp
+
+nt_tests = \
+ nt/nteventlogappendertestcase.cpp
+
testsuite_SOURCES = \
+ $(customlogger_tests) \
+ $(defaultinit_tests) \
+ $(helpers) \
+ $(net_tests) \
+ $(pattern_tests) \
+ $(rolling_tests) \
+ $(util) \
+ $(varia_tests) \
+ $(db_tests) \
+ $(xml_tests) \
+ $(nt_tests) \
asyncappendertestcase.cpp\
encodingtest.cpp\
filetestcase.cpp \
@@ -29,53 +129,32 @@
writerappendertestcase.cpp \
ndctestcase.cpp
-
testsuite_LDADD = \
$(top_builddir)/src/liblog4cxx.la
testsuite_LDFLAGS = \
- -Wl,--whole-archive,customlogger/libcustomlogger.a,--no-whole-archive\
- -Wl,--whole-archive,defaultinit/libdefaultinit.a,--no-whole-archive\
- -Wl,--whole-archive,helpers/libhelpers.a,--no-whole-archive\
- -Wl,--whole-archive,net/libnet.a,--no-whole-archive\
- -Wl,--whole-archive,pattern/libpattern.a,--no-whole-archive\
- -Wl,--whole-archive,util/libutil.a,--no-whole-archive\
- -Wl,--whole-archive,varia/libvaria.a,--no-whole-archive\
- -Wl,--whole-archive,xml/libxml.a,--no-whole-archive\
- -Wl,--whole-archive,db/libdb.a,--no-whole-archive\
- -Wl,--whole-archive,nt/libnt.a,--no-whole-archive\
@LIBS_CPPUNIT@
-AM_CPPFLAGS = @CPPFLAGS_CPPUNIT@
+AM_CPPFLAGS = \
+ @CPPFLAGS_CPPUNIT@
testsuite_DEPENDENCIES = \
- customlogger/libcustomlogger.a\
- defaultinit/libdefaultinit.a\
- helpers/libhelpers.a\
- net/libnet.a\
- pattern/libpattern.a\
- util/libutil.a\
- varia/libvaria.a\
- xml/libxml.a\
- db/libdb.a\
- nt/libnt.a\
$(top_builddir)/src/liblog4cxx.la
shortsocketserver_SOURCES = \
+ $(util) \
+ $(xml_tests) \
shortsocketserver.cpp
shortsocketserver_LDADD = \
$(top_builddir)/src/liblog4cxx.la
shortsocketserver_LDFLAGS = \
- -Wl,--whole-archive,util/libutil.a,--no-whole-archive\
- -Wl,--whole-archive,xml/libxml.a,--no-whole-archive\
@LIBS_CPPUNIT@
shortsocketserver_DEPENDENCIES = \
- util/libutil.a\
- xml/libxml.a\
$(top_builddir)/src/liblog4cxx.la
check: testsuite shortsocketserver
+
endif
