Author: carnold
Date: Tue Nov 20 17:15:50 2007
New Revision: 596896
URL: http://svn.apache.org/viewvc?rev=596896&view=rev
Log:
LOGCXX-7: Remove shortsocketserver.cpp
Removed:
logging/log4cxx/trunk/src/test/cpp/shortsocketserver.cpp
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/test/cpp/Makefile.am
logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp
Modified: logging/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=596896&r1=596895&r2=596896&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue Nov 20 17:15:50 2007
@@ -733,36 +733,8 @@
</antcall>
</target>
-<target name="build-shortsocketserver" depends="build"
- description="builds a socket server used by unit tests">
- <mkdir dir="${log4cxx.lib.dir}/shortsocketserver_obj"/>
-
- <property name="project.compiler" value="${compiler}"/>
- <cc name="${project.compiler}"
- exceptions="true"
- outfile="${build.dir}/shortsocketserver"
- subsystem="console"
- multithreaded="true"
- outtype="executable"
- objdir="${log4cxx.lib.dir}/shortsocketserver_obj"
- debug="${debug}"
- projectsOnly="${projectsOnly}">
- <fileset dir="${tests.cpp.dir}">
- <include name="shortsocketserver.cpp"/>
- <include name="net/socketservertestcase.h"/>
- </fileset>
- <includepath path="${include.dir}"/>
- <compilerarg value="${pic-option}" if="pic-option"/>
- <defineset define="LOG4CXX_STATIC" if="is-static"/>
- <libset libs="log4cxx${lib-suffix}" dir="${log4cxx.lib.dir}"/>
- &libsets;
- <project outfile="${project.dir}/shortsocketserver"
type="${project.type}" if="project.if"/>
- </cc>
-
-</target>
-
-<target name="build-unittest" depends="build, build-shortsocketserver,
build-cppunit"
+<target name="build-unittest" depends="build, build-cppunit"
description="Builds unit test app">
<mkdir dir="${log4cxx.lib.dir}/log4cxx-test_obj"/>
@@ -778,7 +750,6 @@
debug="${debug}"
projectsOnly="${projectsOnly}">
<fileset dir="${tests.cpp.dir}" includes="**/*.cpp **/*.h">
- <exclude name="shortsocketserver.cpp"/>
</fileset>
<includepath path="${cppunit.include.dir}" if="cppunit.include.dir"/>
<includepath path="${include.dir}"/>
@@ -816,7 +787,6 @@
debug="${debug}"
projectsOnly="${projectsOnly}">
<fileset dir="${tests.cpp.dir}" includes="defaultinit/*.cpp main.cpp">
- <exclude name="shortsocketserver.cpp"/>
</fileset>
<includepath path="${cppunit.include.dir}" if="cppunit.include.dir"/>
<includepath path="${include.dir}"/>
@@ -856,7 +826,6 @@
debug="${debug}"
projectsOnly="${projectsOnly}">
<fileset dir="${tests.cpp.dir}" includes="${src.pattern}">
- <exclude name="shortsocketserver.cpp"/>
</fileset>
<includepath path="${cppunit.include.dir}" if="cppunit.include.dir"/>
<includepath path="${include.dir}"/>
@@ -878,7 +847,7 @@
</target>
<target name="build-standalone-unittest"
- depends="build-shortsocketserver, build-cppunit"
+ depends="build-cppunit"
description="Builds a unit tests + log4cxx executable">
<mkdir dir="${executable.dir}/static/log4cxx-standalone-test_obj"/>
<property name="project.compiler" value="${compiler}"/>
@@ -895,7 +864,6 @@
<fileset dir="${src.dir}" includes="*.cpp"
excludes="**/iconv_module.cpp"/>
<fileset dir="${include.dir}" includes="**/*.h"/>
<fileset dir="${tests.cpp.dir}" includes="**/*.cpp **/*.h">
- <exclude name="shortsocketserver.cpp"/>
</fileset>
<includepath path="${cppunit.include.dir}" if="cppunit.include.dir"/>
<includepath path="${include.dir}"/>
Modified: logging/log4cxx/trunk/src/test/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/Makefile.am?rev=596896&r1=596895&r2=596896&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/Makefile.am (original)
+++ logging/log4cxx/trunk/src/test/cpp/Makefile.am Tue Nov 20 17:15:50 2007
@@ -26,7 +26,7 @@
INCLUDES = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include
-noinst_PROGRAMS = testsuite shortsocketserver
+noinst_PROGRAMS = testsuite
customlogger_tests = \
customlogger/xlogger.cpp\
@@ -162,20 +162,6 @@
testsuite_DEPENDENCIES = \
$(top_builddir)/src/main/cpp/liblog4cxx.la
-shortsocketserver_SOURCES = \
- $(util) \
- $(xml_tests) \
- shortsocketserver.cpp
-
-shortsocketserver_LDADD = \
- $(top_builddir)/src/main/cpp/liblog4cxx.la
-
-shortsocketserver_LDFLAGS = \
- @LIBS_CPPUNIT@
-
-shortsocketserver_DEPENDENCIES = \
- $(top_builddir)/src/main/cpp/liblog4cxx.la
-
-check: testsuite shortsocketserver
+check: testsuite
endif
Modified: logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp?rev=596896&r1=596895&r2=596896&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp Tue Nov 20
17:15:50 2007
@@ -88,11 +88,13 @@
void setUp()
{
root = Logger::getRootLogger();
+ MDC::clear();
logger =
Logger::getLogger(LOG4CXX_TEST_STR("java.org.apache.log4j.PatternLayoutTest"));
}
void tearDown()
{
+ MDC::clear();
root->getLoggerRepository()->resetConfiguration();
}
