generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 10:32:56 +01:00
Code Issues Projects Releases Wiki Activity

Add -ignore <file> option to get rid of DOS script issues.

Browse Source 
Rollback to previous rendering.
This commit is contained in:
Francis ANDRE
2019-12-18 16:27:19 +01:00
parent b5ca9353be
commit 6a81580533
7 changed files with 172 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
CppUnit/CppUnit_vs150.vcxproj
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="debug_shared|Win32"> <ProjectConfiguration Include="debug_shared|Win32">
@@ -32,7 +32,7 @@
<RootNamespace>CppUnit</RootNamespace> <RootNamespace>CppUnit</RootNamespace>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
@@ -63,27 +63,27 @@
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"/> <ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/> <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"/> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion> <_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppUnitd</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppUnitd</TargetName>
@@ -125,18 +125,18 @@
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck> <BufferSecurityCheck>true</BufferSecurityCheck>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link> <Link>
<OutputFile>..\bin\PocoCppUnitd.dll</OutputFile> <OutputFile>..\bin\PocoCppUnitd.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -156,18 +156,19 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link> <Link>
<OutputFile>..\bin\PocoCppUnit.dll</OutputFile> <OutputFile>..\bin\PocoCppUnit.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -186,19 +187,19 @@
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck> <BufferSecurityCheck>true</BufferSecurityCheck>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<ProgramDataBaseFileName>..\lib\PocoCppUnitmtd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\PocoCppUnitmtd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCppUnitMTd.lib</OutputFile> <OutputFile>..\lib\PocoCppUnitMTd.lib</OutputFile>
</Lib> </Lib>
@@ -218,11 +219,12 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCppUnitMT.lib</OutputFile> <OutputFile>..\lib\PocoCppUnitMT.lib</OutputFile>
</Lib> </Lib>
@@ -233,19 +235,19 @@
<AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\include;..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck> <BufferSecurityCheck>true</BufferSecurityCheck>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<ProgramDataBaseFileName>..\lib\PocoCppUnitMDd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCppUnitMDd.lib</OutputFile> <OutputFile>..\lib\PocoCppUnitMDd.lib</OutputFile>
</Lib> </Lib>
@@ -265,44 +267,45 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/> <PrecompiledHeader />
<ProgramDataBaseFileName>..\lib\PocoCppUnitmd.pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>..\lib\PocoCppUnitmd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/> <DebugInformationFormat />
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Lib> <Lib>
<OutputFile>..\lib\PocoCppUnitMD.lib</OutputFile> <OutputFile>..\lib\PocoCppUnitMD.lib</OutputFile>
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\CppUnitException.cpp"/> <ClCompile Include="src\CppUnitException.cpp" />
<ClCompile Include="src\TestCase.cpp"/> <ClCompile Include="src\TestCase.cpp" />
<ClCompile Include="src\TestDecorator.cpp"/> <ClCompile Include="src\TestDecorator.cpp" />
<ClCompile Include="src\TestFailure.cpp"/> <ClCompile Include="src\TestFailure.cpp" />
<ClCompile Include="src\TestResult.cpp"/> <ClCompile Include="src\TestResult.cpp" />
<ClCompile Include="src\TestRunner.cpp"/> <ClCompile Include="src\TestRunner.cpp" />
<ClCompile Include="src\TestSuite.cpp"/> <ClCompile Include="src\TestSuite.cpp" />
<ClCompile Include="src\TextTestResult.cpp"/> <ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="include\CppUnit\CppUnit.h"/> <ClInclude Include="include\CppUnit\CppUnit.h" />
<ClInclude Include="include\CppUnit\CppUnitException.h"/> <ClInclude Include="include\CppUnit\CppUnitException.h" />
<ClInclude Include="include\CppUnit\estring.h"/> <ClInclude Include="include\CppUnit\estring.h" />
<ClInclude Include="include\CppUnit\Guards.h"/> <ClInclude Include="include\CppUnit\Guards.h" />
<ClInclude Include="include\CppUnit\Orthodox.h"/> <ClInclude Include="include\CppUnit\Orthodox.h" />
<ClInclude Include="include\CppUnit\RepeatedTest.h"/> <ClInclude Include="include\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\CppUnit\Test.h"/> <ClInclude Include="include\CppUnit\Test.h" />
<ClInclude Include="include\CppUnit\TestCaller.h"/> <ClInclude Include="include\CppUnit\TestCaller.h" />
<ClInclude Include="include\CppUnit\TestCase.h"/> <ClInclude Include="include\CppUnit\TestCase.h" />
<ClInclude Include="include\CppUnit\TestDecorator.h"/> <ClInclude Include="include\CppUnit\TestDecorator.h" />
<ClInclude Include="include\CppUnit\TestFailure.h"/> <ClInclude Include="include\CppUnit\TestFailure.h" />
<ClInclude Include="include\CppUnit\TestResult.h"/> <ClInclude Include="include\CppUnit\TestResult.h" />
<ClInclude Include="include\CppUnit\TestRunner.h"/> <ClInclude Include="include\CppUnit\TestRunner.h" />
<ClInclude Include="include\CppUnit\TestSetup.h"/> <ClInclude Include="include\CppUnit\TestSetup.h" />
<ClInclude Include="include\CppUnit\TestSuite.h"/> <ClInclude Include="include\CppUnit\TestSuite.h" />
<ClInclude Include="include\CppUnit\TextTestResult.h"/> <ClInclude Include="include\CppUnit\TextTestResult.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"/> <ImportGroup Label="ExtensionTargets" />
</Project> </Project>

2
CppUnit/include/CppUnit/TestRunner.h
View File

@@ -50,7 +50,7 @@ public:
void addTest(const std::string& name, Test* test); void addTest(const std::string& name, Test* test);
protected: protected:
bool run(Test* test); bool run(Test* test, const std::string& ignore);
void printBanner(); void printBanner();
void print(const std::string& name, Test* pTest, int indent); void print(const std::string& name, Test* pTest, int indent);
Test* find(const std::string& name, Test* pTest, const std::string& testName); Test* find(const std::string& name, Test* pTest, const std::string& testName);

3
CppUnit/include/CppUnit/TextTestResult.h
View File

@@ -20,7 +20,9 @@ class CppUnit_API TextTestResult: public TestResult
{ {
public: public:
TextTestResult(); TextTestResult();
TextTestResult(const std::string& ignore);
TextTestResult(std::ostream& ostr); TextTestResult(std::ostream& ostr);
TextTestResult(std::ostream& ostr, const std::string& ignore);
virtual void addError(Test* test, CppUnitException* e); virtual void addError(Test* test, CppUnitException* e);
virtual void addFailure(Test* test, CppUnitException* e); virtual void addFailure(Test* test, CppUnitException* e);
@@ -33,6 +35,7 @@ public:
protected: protected:
std::string shortName(const std::string& testName); std::string shortName(const std::string& testName);
void setup(); void setup();
void ignoring(const std::string ignore);
private: private:
std::ostream& _ostr; std::ostream& _ostr;

17
CppUnit/src/TestRunner.cpp
View File

@@ -8,6 +8,7 @@
#include "CppUnit/TestSuite.h" #include "CppUnit/TestSuite.h"
#include "CppUnit/TextTestResult.h" #include "CppUnit/TextTestResult.h"
#include <iostream> #include <iostream>
#include <fstream>
namespace CppUnit { namespace CppUnit {
@@ -35,7 +36,7 @@ TestRunner::~TestRunner()
void TestRunner::printBanner() void TestRunner::printBanner()
{ {
_ostr _ostr
<< "Usage: driver [-all] [-long] [-print] [-wait] [name] ..." << std::endl << "Usage: driver [-all] [-ignore <file> ] [-long] [-print] [-wait] [name] ..." << std::endl
<< " where name is the name of a test case class" << std::endl; << " where name is the name of a test case class" << std::endl;
} }
@@ -49,6 +50,7 @@ bool TestRunner::run(const std::vector<std::string>& args)
bool wait = false; bool wait = false;
bool printed = false; bool printed = false;
bool long_running = false; bool long_running = false;
std::string ignore;
std::vector<std::string> setup; std::vector<std::string> setup;
@@ -71,6 +73,11 @@ bool TestRunner::run(const std::vector<std::string>& args)
long_running = true; long_running = true;
continue; continue;
} }
else if (arg == "-ignore")
{
ignore = args[++i];
continue;
}
else if (arg == "-print") else if (arg == "-print")
{ {
for (Mappings::iterator it = _mappings.begin(); it != _mappings.end(); ++it) for (Mappings::iterator it = _mappings.begin(); it != _mappings.end(); ++it)
@@ -114,7 +121,7 @@ bool TestRunner::run(const std::vector<std::string>& args)
} }
} }
} }
std::cout << "ignore file:" << ignore << std::endl;
if (all) if (all)
{ {
tests.clear(); tests.clear();
@@ -131,7 +138,7 @@ bool TestRunner::run(const std::vector<std::string>& args)
continue; continue;
if (setup.size() > 0) if (setup.size() > 0)
testToRun->addSetup(setup); testToRun->addSetup(setup);
if (!run(testToRun)) success = false; if (!run(testToRun, ignore)) success = false;
numberOfTests++; numberOfTests++;
} }
@@ -151,9 +158,9 @@ bool TestRunner::run(const std::vector<std::string>& args)
} }
bool TestRunner::run(Test* test) bool TestRunner::run(Test* test, const std::string& ignore)
{ {
TextTestResult result(_ostr); TextTestResult result(_ostr, ignore);
test->run(&result); test->run(&result);
_ostr << result << std::endl; _ostr << result << std::endl;

96
CppUnit/src/TextTestResult.cpp
View File

@@ -8,17 +8,47 @@
#include "CppUnit/Test.h" #include "CppUnit/Test.h"
#include "CppUnit/estring.h" #include "CppUnit/estring.h"
#include <iostream> #include <iostream>
#include <fstream>
#include <sstream>
#include <iomanip> #include <iomanip>
#include <cstdlib> #include <cstdlib>
#include <cctype> #include <cctype>
#include <exception>
namespace CppUnit { namespace CppUnit {
TextTestResult::TextTestResult() :
TextTestResult::TextTestResult(): _ostr(std::cout)
{
}
TextTestResult::TextTestResult(const std::string& ignore):
_ostr(std::cout) _ostr(std::cout)
{ {
if (!ignore.empty())
{
try {
std::ifstream ifs(ignore);
if (ifs.is_open()) {
char line[256];
while (ifs.getline(line, sizeof(line)))
{
if (line[0] == '#')
continue;
std::string ignored(line);
std::string::const_iterator it = ignored.begin();
std::string::const_iterator end = ignored.end();
ignoring(ignored);
}
ifs.close();
}
}
catch (std::exception e) {
std::cout << e.what() << std::endl;
}
}
setup(); setup();
} }
@@ -26,10 +56,45 @@ TextTestResult::TextTestResult():
TextTestResult::TextTestResult(std::ostream& ostr): TextTestResult::TextTestResult(std::ostream& ostr):
_ostr(ostr) _ostr(ostr)
{ {
}
TextTestResult::TextTestResult(std::ostream& ostr, const std::string& ignore) :
_ostr(ostr)
{
if (!ignore.empty())
{
std::ifstream ifs(ignore);
if (ifs.is_open()) {
char line[256];
while (ifs.getline(line, sizeof(line)))
{
if (line[0] == '#')
continue;
std::string ignored(line);
std::string::const_iterator it = ignored.begin();
std::string::const_iterator end = ignored.end();
ignoring(ignored);
}
ifs.close();
}
}
setup(); setup();
} }
void TextTestResult::ignoring(const std::string ignore)
{
std::string::const_iterator it = ignore.begin();
std::string::const_iterator end = ignore.end();
for (;;)
{
while (it != end && (std::isspace(*it) || *it == '"' || *it == ',' || *it == '\'')) ++it;
if (it == end)
break;
std::string test;
while (it != end && *it != ',' && *it != '"' && *it != '\'') test += *it++;
if (!test.empty()) _ignored.insert(test.erase(test.find_last_not_of(" \n\r\t") + 1));
}
}
void TextTestResult::setup() void TextTestResult::setup()
{ {
#if !defined(_WIN32_WCE) #if !defined(_WIN32_WCE)
@@ -39,17 +104,9 @@ void TextTestResult::setup()
std::string ignored = env; std::string ignored = env;
std::string::const_iterator it = ignored.begin(); std::string::const_iterator it = ignored.begin();
std::string::const_iterator end = ignored.end(); std::string::const_iterator end = ignored.end();
for (;;) ignoring(ignored);
{ }
while (it != end && (std::isspace(*it) || *it == '"' || *it == ',' || *it == '\'')) ++it;
if (it == end)
break;
std::string test;
while (it != end && *it != ',' && *it != '"' && *it != '\'') test += *it++;
if (!test.empty()) _ignored.insert(test);
}
}
#endif #endif
} }
@@ -196,18 +253,11 @@ void TextTestResult::print(std::ostream& stream)
void TextTestResult::printHeader(std::ostream& stream) void TextTestResult::printHeader(std::ostream& stream)
{ {
if (wasSuccessful()) if (!wasSuccessful())
stream << "OK ("
<< runTests() << " tests)"
<< std::endl;
else
stream << "!!!FAILURES!!!" << std::endl stream << "!!!FAILURES!!!" << std::endl
<< "Runs: " << "Runs: " << runTests()
<< runTests () << " Failures: " << testFailures()
<< " Failures: " << " Errors: " << testErrors()
<< testFailures ()
<< " Errors: "
<< testErrors ()
<< std::endl; << std::endl;
} }

7
build/script/runtests2.cmd
View File

@@ -30,8 +30,8 @@ if "%1" =="-d" (
shift shift
) )
set PATH=%CD%\%BINDIR%;%PATH% set PATH=%POCO_BASE%\%BINDIR%;%PATH%
echo PATH=%PATH% set IGNORE=-ignore %POCO_BASE%\cppignore.txt
if not "%1" == "" ( if not "%1" == "" (
set TESTCOMPONENTS="%1" set TESTCOMPONENTS="%1"
@@ -69,7 +69,8 @@ for /f %%C in ( %TESTCOMPONENTS% ) do (
set /a runs=!runs! + 1 set /a runs=!runs! + 1
set dir=%CD% set dir=%CD%
cd %%C\testsuite cd %%C\testsuite
%BINDIR%\%TESTRUNNER% %TESTRUNNERARGS% echo %BINDIR%\%TESTRUNNER% %IGNORE% %TESTRUNNERARGS%
%BINDIR%\%TESTRUNNER% %IGNORE% %TESTRUNNERARGS%
if !ERRORLEVEL! neq 0 ( if !ERRORLEVEL! neq 0 (
set /a failures=!failures! + 1 set /a failures=!failures! + 1
set failedTests=!failedTests! %%C set failedTests=!failedTests! %%C

17
cppignore.txt Normal file
View File

@@ -0,0 +1,17 @@
class CppUnit::TestCaller<class NTPClientTest>.testTimeSync
class CppUnit::TestCaller<class GlobTest>.testGlob
class CppUnit::TestCaller<class RawSocketTest>.testEchoIPv4
class CppUnit::TestCaller<class RawSocketTest>.testSendToReceiveFromIPv4
class CppUnit::TestCaller<class ICMPClientTest>.testPing
class CppUnit::TestCaller<class ICMPClientTest>.testBigPing
class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy
class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy
class CppUnit::TestCaller<class TCPServerTest>.testReuseSocket
class CppUnit::TestCaller<class HTTPSClientSessionTest>.testInterop
class CppUnit::TestCaller<class PathTest>.testFind
class CppUnit::TestCaller<class ThreadTest>.testSleep
class CppUnit::TestCaller<class TimerTest>.testTimer
class CppUnit::TestCaller<class TimerTest>.testScheduleInterval
class CppUnit::TestCaller<class TimerTest>.testScheduleIntervalTimestamp
class CppUnit::TestCaller<class TimerTest>.testScheduleIntervalClock
class CppUnit::TestCaller<class TimerTest>.testScheduleAtFixedRate