Author: afester
Date: Fri Dec 2 10:09:05 2005
New Revision: 351786
URL: http://svn.apache.org/viewcvs?rev=351786&view=rev
Log:
LOGCXX-43: add missing source files, fix test execution in separate build tree
Modified:
logging/log4cxx/trunk/tests/Makefile.am
logging/log4cxx/trunk/tests/input/Makefile.am
logging/log4cxx/trunk/tests/input/ndc/Makefile.am
logging/log4cxx/trunk/tests/input/performance/Makefile.am
logging/log4cxx/trunk/tests/input/rolling/Makefile.am
logging/log4cxx/trunk/tests/input/xml/Makefile.am
logging/log4cxx/trunk/tests/src/Makefile.am
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
logging/log4cxx/trunk/tests/witness/Makefile.am
logging/log4cxx/trunk/tests/witness/encoding/Makefile.am
logging/log4cxx/trunk/tests/witness/ndc/Makefile.am
logging/log4cxx/trunk/tests/witness/rolling/Makefile.am
Modified: logging/log4cxx/trunk/tests/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/Makefile.am Fri Dec 2 10:09:05 2005
@@ -3,6 +3,15 @@
if TESTS
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+ find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+ fi
+
prepare:
@if test ! -d "output"; then \
mkdir output; \
@@ -15,7 +24,13 @@
cleanOutputDir:
@rm -f output/*
-check: regression longUnit
+check: prepare run-unittest
+
+run-unittest: cleanOutputDir
+ @export TOTO=wonderful; \
+ export key1=value1; \
+ export key2=value2; \
+ src/testsuite +TestCase1
regression: Minimum Logger DOM CustomLevel \
CustomLogger PatternLayout \
Modified: logging/log4cxx/trunk/tests/input/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/input/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/Makefile.am Fri Dec 2 10:09:05 2005
@@ -1,2 +1,11 @@
SUBDIRS = ndc performance xml rolling
EXTRA_DIST = *.properties
+
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+ find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+ fi
Modified: logging/log4cxx/trunk/tests/input/ndc/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/ndc/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/input/ndc/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/ndc/Makefile.am Fri Dec 2 10:09:05 2005
@@ -1 +1,10 @@
EXTRA_DIST = *.properties
+
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+ find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+ fi
Modified: logging/log4cxx/trunk/tests/input/performance/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/performance/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/input/performance/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/performance/Makefile.am Fri Dec 2
10:09:05 2005
@@ -1 +1,10 @@
EXTRA_DIST = *.xml
+
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+ find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+ fi
Modified: logging/log4cxx/trunk/tests/input/rolling/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/rolling/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/input/rolling/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/rolling/Makefile.am Fri Dec 2 10:09:05
2005
@@ -1 +1,10 @@
EXTRA_DIST = *.xml *.properties
+
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+ find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+ fi
Modified: logging/log4cxx/trunk/tests/input/xml/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/xml/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/input/xml/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/xml/Makefile.am Fri Dec 2 10:09:05 2005
@@ -1 +1,10 @@
-EXTRA_DIST = log4j.dtd *.xml
\ No newline at end of file
+EXTRA_DIST = log4j.dtd *.xml
+
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+ find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+ fi
Modified: logging/log4cxx/trunk/tests/src/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/Makefile.am Fri Dec 2 10:09:05 2005
@@ -5,11 +5,13 @@
if TESTS
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+
noinst_PROGRAMS = testsuite shortsocketserver
testsuite_SOURCES = \
asyncappendertestcase.cpp\
+ encodingtest.cpp\
filetestcase.cpp \
hierarchythresholdtestcase.cpp\
l7dtestcase.cpp\
@@ -23,6 +25,7 @@
consoleappendertestcase.cpp\
fileappendertestcase.cpp\
rollingfileappendertestcase.cpp\
+ streamtestcase.cpp\
writerappendertestcase.cpp \
ndctestcase.cpp
@@ -41,7 +44,7 @@
-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@ -lboost_regex
+ @LIBS_CPPUNIT@
AM_CPPFLAGS = @CPPFLAGS_CPPUNIT@
@@ -67,7 +70,7 @@
shortsocketserver_LDFLAGS = \
-Wl,--whole-archive,util/libutil.a,--no-whole-archive\
-Wl,--whole-archive,xml/libxml.a,--no-whole-archive\
- @LIBS_CPPUNIT@ -lboost_regex
+ @LIBS_CPPUNIT@
shortsocketserver_DEPENDENCIES = \
util/libutil.a\
Modified: logging/log4cxx/trunk/tests/src/customlogger/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/customlogger/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/customlogger/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/customlogger/Makefile.am Fri Dec 2
10:09:05 2005
@@ -5,7 +5,7 @@
noinst_LIBRARIES = libcustomlogger.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libcustomlogger_a_SOURCES = \
xlogger.cpp\
Modified: logging/log4cxx/trunk/tests/src/db/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/db/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/db/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/db/Makefile.am Fri Dec 2 10:09:05 2005
@@ -3,7 +3,8 @@
if TESTS
noinst_LIBRARIES = libdb.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+
libdb_a_SOURCES = \
odbcappendertestcase.cpp
Modified: logging/log4cxx/trunk/tests/src/defaultinit/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/defaultinit/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/defaultinit/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/defaultinit/Makefile.am Fri Dec 2 10:09:05
2005
@@ -4,7 +4,7 @@
noinst_LIBRARIES = libdefaultinit.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libdefaultinit_a_SOURCES = \
testcase1.cpp\
Modified: logging/log4cxx/trunk/tests/src/helpers/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/helpers/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/helpers/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/helpers/Makefile.am Fri Dec 2 10:09:05 2005
@@ -4,11 +4,13 @@
noinst_LIBRARIES = libhelpers.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libhelpers_a_SOURCES = \
absolutetimedateformattestcase.cpp \
cacheddateformattestcase.cpp \
+ charsetdecodertestcase.cpp \
+ charsetencodertestcase.cpp \
cyclicbuffertestcase.cpp\
datetimedateformattestcase.cpp \
iso8601dateformattestcase.cpp \
@@ -17,6 +19,7 @@
propertiestestcase.cpp \
relativetimedateformattestcase.cpp \
stringtokenizertestcase.cpp \
+ stringhelpertestcase.cpp \
timezonetestcase.cpp \
transcodertestcase.cpp \
unicodehelpertestcase.cpp
Modified: logging/log4cxx/trunk/tests/src/net/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/net/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/net/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/net/Makefile.am Fri Dec 2 10:09:05 2005
@@ -4,10 +4,16 @@
if TESTS
noinst_LIBRARIES = libnet.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libnet_a_SOURCES = \
- socketservertestcase.cpp
+ smtpappendertestcase.cpp \
+ socketappendertestcase.cpp \
+ sockethubappendertestcase.cpp \
+ socketservertestcase.cpp \
+ syslogappendertestcase.cpp \
+ telnetappendertestcase.cpp \
+ xmlsocketappendertestcase.cpp
check: libnet.a
Modified: logging/log4cxx/trunk/tests/src/nt/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/nt/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/nt/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/nt/Makefile.am Fri Dec 2 10:09:05 2005
@@ -3,7 +3,7 @@
if TESTS
noinst_LIBRARIES = libnt.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libnt_a_SOURCES = \
nteventlogappendertestcase.cpp
Modified: logging/log4cxx/trunk/tests/src/pattern/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/pattern/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/pattern/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/pattern/Makefile.am Fri Dec 2 10:09:05 2005
@@ -5,7 +5,7 @@
noinst_LIBRARIES = libpattern.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libpattern_a_SOURCES = \
num343patternconverter.cpp \
Modified: logging/log4cxx/trunk/tests/src/rolling/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/rolling/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/rolling/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/rolling/Makefile.am Fri Dec 2 10:09:05 2005
@@ -4,7 +4,7 @@
noinst_LIBRARIES = librolling.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
librolling_a_SOURCES = \
filenamepatterntestcase.cpp \
Modified: logging/log4cxx/trunk/tests/src/util/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/util/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/util/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/util/Makefile.am Fri Dec 2 10:09:05 2005
@@ -5,11 +5,12 @@
noinst_LIBRARIES = libutil.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libutil_a_SOURCES = \
absolutetimefilter.cpp\
absolutedateandtimefilter.cpp\
+ binarycompare.cpp\
compare.cpp\
controlfilter.cpp\
filenamefilter.cpp \
Modified: logging/log4cxx/trunk/tests/src/varia/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/varia/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/varia/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/varia/Makefile.am Fri Dec 2 10:09:05 2005
@@ -4,7 +4,8 @@
noinst_LIBRARIES = libvaria.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+
libvaria_a_SOURCES = \
errorhandlertestcase.cpp \
Modified: logging/log4cxx/trunk/tests/src/xml/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/xml/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/xml/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/xml/Makefile.am Fri Dec 2 10:09:05 2005
@@ -5,7 +5,8 @@
noinst_LIBRARIES = libxml.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+
libxml_a_SOURCES = \
customleveltestcase.cpp \
Modified: logging/log4cxx/trunk/tests/witness/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/witness/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/witness/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/witness/Makefile.am Fri Dec 2 10:09:05 2005
@@ -12,3 +12,12 @@
fallback \
simple \
ttcc
+
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+ find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+ fi
Modified: logging/log4cxx/trunk/tests/witness/encoding/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/witness/encoding/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/witness/encoding/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/witness/encoding/Makefile.am Fri Dec 2
10:09:05 2005
@@ -1,3 +1,12 @@
EXTRA_DIST = UTF-* \
ascii.log \
latin1.log
+
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+ find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+ fi
Modified: logging/log4cxx/trunk/tests/witness/ndc/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/witness/ndc/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/witness/ndc/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/witness/ndc/Makefile.am Fri Dec 2 10:09:05 2005
@@ -1 +1,10 @@
EXTRA_DIST = NDC.*
+
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+ find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+ fi
Modified: logging/log4cxx/trunk/tests/witness/rolling/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/witness/rolling/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/witness/rolling/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/witness/rolling/Makefile.am Fri Dec 2 10:09:05
2005
@@ -1,3 +1,11 @@
EXTRA_DIST = sbr-test* \
tbr-test*
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+ @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+ find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+ fi
