diff options
| author | Baptiste Lepilleur <gaiacrtn@free.fr> | 2002-04-19 13:11:38 +0000 |
|---|---|---|
| committer | Baptiste Lepilleur <gaiacrtn@free.fr> | 2002-04-19 13:11:38 +0000 |
| commit | 0aebae162476acace5580d3b54109111ff3514ca (patch) | |
| tree | ea7f2a17f2dc458026d5322fa07acb8ffe2ce8b7 /src/cppunit | |
| parent | 626e37841cfedef589fecb975876e7d22986cfb7 (diff) | |
| download | cppunit-0aebae162476acace5580d3b54109111ff3514ca.tar.gz | |
Src/cppunit/PlugInManager.
src/cppunit/PlugInManager.cpp: fixed bug in unload().
* include/cppunit/TypeInfoHelper.h:
* src/cppunit/TypeInfoHelper.cpp: Implementation is now always available
is CPPUNIT_HAVE_RTTI is not 0. This removes the need to use
different libraries. CPPUNIT_USE_TYPEINFO_NAME can be set on a
case by case basis for HelperMacros.
* src/cppunit/TestFactoryRegistry.cpp: removed unused include of
TypeInfoHelper.h.
* include/cppunit/TextTestProgressListener.h:
* src/cppunit/TextTestProgressListener.cpp: used endTest() instead
of done() to finalize.
* src/msvc6/TestPlugInRunner/TestPlugIn.h:
* src/msvc6/TestPlugInRunner/TestPlugIn.cpp: updated to use the
new test plug-in system.
* examples/simple/SimplePlugIn.cpp:
* examples/simple/simple_plugin.dsp: crossplatform test plug-in
example using 'simple'.
* examples/msvc6/EasyTestPlugIn/*: projects replaced with the
crossplatform projecct examples/simple/simple_plugin.dsp.
Diffstat (limited to 'src/cppunit')
| -rw-r--r-- | src/cppunit/BriefTestProgressListener.cpp | 6 | ||||
| -rw-r--r-- | src/cppunit/PlugInManager.cpp | 1 | ||||
| -rw-r--r-- | src/cppunit/TestFactoryRegistry.cpp | 4 | ||||
| -rw-r--r-- | src/cppunit/TextTestProgressListener.cpp | 4 | ||||
| -rw-r--r-- | src/cppunit/TypeInfoHelper.cpp | 6 | ||||
| -rw-r--r-- | src/cppunit/cppunit.dsp | 37 |
6 files changed, 13 insertions, 45 deletions
diff --git a/src/cppunit/BriefTestProgressListener.cpp b/src/cppunit/BriefTestProgressListener.cpp index 8864ad5..76bc2a3 100644 --- a/src/cppunit/BriefTestProgressListener.cpp +++ b/src/cppunit/BriefTestProgressListener.cpp @@ -46,11 +46,5 @@ BriefTestProgressListener::endTest( Test *test ) } -void -BriefTestProgressListener::done() -{ -} - - } // namespace CppUnit diff --git a/src/cppunit/PlugInManager.cpp b/src/cppunit/PlugInManager.cpp index ad17a65..f339c63 100644 --- a/src/cppunit/PlugInManager.cpp +++ b/src/cppunit/PlugInManager.cpp @@ -76,6 +76,7 @@ PlugInManager::unload( PlugInInfo &plugIn ) try { plugIn.m_interface->uninitialize( &TestFactoryRegistry::getRegistry() ); + delete plugIn.m_manager; } catch (...) { diff --git a/src/cppunit/TestFactoryRegistry.cpp b/src/cppunit/TestFactoryRegistry.cpp index ec10c5f..f42df2d 100644 --- a/src/cppunit/TestFactoryRegistry.cpp +++ b/src/cppunit/TestFactoryRegistry.cpp @@ -3,10 +3,6 @@ #include <map> #include <assert.h> -#if CPPUNIT_USE_TYPEINFO_NAME -# include "cppunit/extensions/TypeInfoHelper.h" -#endif - namespace CppUnit { diff --git a/src/cppunit/TextTestProgressListener.cpp b/src/cppunit/TextTestProgressListener.cpp index 0eb783d..409099e 100644 --- a/src/cppunit/TextTestProgressListener.cpp +++ b/src/cppunit/TextTestProgressListener.cpp @@ -32,11 +32,13 @@ TextTestProgressListener::addFailure( const TestFailure &failure ) void -TextTestProgressListener::done() +TextTestProgressListener::endTestRun( Test *test, + TestResult *eventManager ) { std::cerr << std::endl; std::cerr.flush(); } + } // namespace CppUnit diff --git a/src/cppunit/TypeInfoHelper.cpp b/src/cppunit/TypeInfoHelper.cpp index a3fff08..c521e84 100644 --- a/src/cppunit/TypeInfoHelper.cpp +++ b/src/cppunit/TypeInfoHelper.cpp @@ -1,9 +1,9 @@ #include <cppunit/Portability.h> +#include <cppunit/extensions/TypeInfoHelper.h> -#if CPPUNIT_USE_TYPEINFO_NAME +#if CPPUNIT_HAVE_RTTI #include <string> -#include <cppunit/extensions/TypeInfoHelper.h> namespace CppUnit { @@ -22,4 +22,4 @@ TypeInfoHelper::getClassName( const std::type_info &info ) } // namespace CppUnit -#endif +#endif // CPPUNIT_HAVE_RTTI diff --git a/src/cppunit/cppunit.dsp b/src/cppunit/cppunit.dsp index bd6e7af..4674718 100644 --- a/src/cppunit/cppunit.dsp +++ b/src/cppunit/cppunit.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=cppunit - Win32 Debug Crossplatform Setting +CFG=CPPUNIT - WIN32 DEBUG !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,13 +13,12 @@ CFG=cppunit - Win32 Debug Crossplatform Setting !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "cppunit.mak" CFG="cppunit - Win32 Debug Crossplatform Setting" +!MESSAGE NMAKE /f "cppunit.mak" CFG="CPPUNIT - WIN32 DEBUG" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "cppunit - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "cppunit - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "cppunit - Win32 Debug Crossplatform Setting" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -75,36 +74,12 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\lib\cppunitd.lib" -!ELSEIF "$(CFG)" == "cppunit - Win32 Debug Crossplatform Setting" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cppunit___Win32_Debug_Without_CPPUNIT_USE_TYPEINFO" -# PROP BASE Intermediate_Dir "cppunit___Win32_Debug_Without_CPPUNIT_USE_TYPEINFO" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugCrossplatform" -# PROP Intermediate_Dir "DebugCrossplatform" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "CPPUNIT_USE_TYPEINFO" /D "WIN32" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32" /D "CPPUNIT_DONT_USE_TYPEINFO" /YX /FD /GZ /c -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\lib\cppunitd.lib" -# ADD LIB32 /nologo /out:"..\..\lib\cppunitcd.lib" - !ENDIF # Begin Target # Name "cppunit - Win32 Release" # Name "cppunit - Win32 Debug" -# Name "cppunit - Win32 Debug Crossplatform Setting" # Begin Group "documentation" # PROP Default_Filter "" @@ -122,6 +97,10 @@ SOURCE=..\..\doc\FAQ # End Source File # Begin Source File +SOURCE="..\..\INSTALL-WIN32.txt" +# End Source File +# Begin Source File + SOURCE=..\..\NEWS # End Source File # Begin Source File @@ -511,10 +490,6 @@ SOURCE=..\..\configure.in # End Source File # Begin Source File -SOURCE="..\..\INSTALL-WIN32.txt" -# End Source File -# Begin Source File - SOURCE=..\..\include\cppunit\Makefile.am # End Source File # Begin Source File |
