Skip to content

Commit eebfcb4

Browse files
pjohnmeyerpjohnmeyer
committed
r11 | charles.nicholson | 2010-03-17 18:49:54 -0500 (Wed, 17 Mar 2010) | 1 line
fix makefile, gcc 4.3 compiles cleanly, fix obj/bin/lib dirs
1 parent bcde677 commit eebfcb4

9 files changed

+64
-9
lines changed

‎src/AssertException.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ AssertException::AssertException()
88
{
99
}
1010

11-
AssertException::~AssertException()
11+
AssertException::~AssertException() throw()
1212
{
1313
}
1414

‎src/AssertException.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AssertException : public std::exception
1313
{
1414
public:
1515
AssertException();
16-
virtual ~AssertException();
16+
virtual ~AssertException() throw();
1717
};
1818

1919
}

‎src/ExecuteTest.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "Config.h"
55
#include "ExceptionMacros.h"
66
#include "TestDetails.h"
7+
#include "TestResults.h"
78
#include "MemoryOutStream.h"
89
#include "AssertException.h"
910
#include "CurrentTest.h"

‎src/XmlTestReporter.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
#include "XmlTestReporter.h"
21
#include "Config.h"
2+
#ifdef UNITTEST_USE_DEFERRED_REPORTER
3+
4+
#include "XmlTestReporter.h"
35

46
#include <iostream>
57
#include <sstream>
@@ -125,3 +127,5 @@ void XmlTestReporter::AddFailure(std::ostream& os, DeferredTestResult const& res
125127
}
126128

127129
}
130+
131+
#endif

‎src/XmlTestReporter.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#ifndef UNITTEST_XMLTESTREPORTER_H
22
#define UNITTEST_XMLTESTREPORTER_H
33

4+
#include "Config.h"
5+
#ifdef UNITTEST_USE_DEFERRED_REPORTER
6+
47
#include "DeferredTestReporter.h"
58

69
#include <iosfwd>
@@ -32,3 +35,4 @@ class XmlTestReporter : public DeferredTestReporter
3235
}
3336

3437
#endif
38+
#endif

‎src/tests/TestXmlTestReporter.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#include "../Config.h"
2+
#ifdef UNITTEST_USE_DEFERRED_REPORTER
3+
14
#include "../unittestpp.h"
25
#include "../XmlTestReporter.h"
36

@@ -181,3 +184,5 @@ TEST_FIXTURE(XmlTestReporterFixture, MultipleFailures)
181184
}
182185

183186
}
187+
188+
#endif

‎src/tests/test-unittestpp.vcproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<Configurations>
1818
<Configuration
1919
Name="Debug|Win32"
20-
OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
20+
OutputDirectory="$(SolutionDir)bin\win32_vc80_$(ConfigurationName)"
2121
IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
2222
ConfigurationType="1"
2323
CharacterSet="1"
@@ -94,7 +94,7 @@
9494
</Configuration>
9595
<Configuration
9696
Name="Release|Win32"
97-
OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
97+
OutputDirectory="$(SolutionDir)bin\win32_vc80_$(ConfigurationName)"
9898
IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
9999
ConfigurationType="1"
100100
CharacterSet="1"
@@ -250,6 +250,10 @@
250250
RelativePath=".\TestUnitTestPP.cpp"
251251
>
252252
</File>
253+
<File
254+
RelativePath=".\TestXmlTestReporter.cpp"
255+
>
256+
</File>
253257
</Files>
254258
<Globals>
255259
</Globals>

‎src/unittestpp.vcproj

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<Configurations>
1818
<Configuration
1919
Name="Debug|Win32"
20-
OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
21-
IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
20+
OutputDirectory="$(SolutionDir)lib\win32_vc80_$(ConfigurationName)"
21+
IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_$(ConfigurationName)"
2222
ConfigurationType="4"
2323
CharacterSet="1"
2424
>
@@ -80,8 +80,8 @@
8080
</Configuration>
8181
<Configuration
8282
Name="Release|Win32"
83-
OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
84-
IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\$(ConfigurationName)"
83+
OutputDirectory="$(SolutionDir)lib\win32_vc80_$(ConfigurationName)"
84+
IntermediateDirectory="$(SolutionDir)obj\$(ProjectName)\win32_vc80_$(ConfigurationName)"
8585
ConfigurationType="4"
8686
CharacterSet="1"
8787
WholeProgramOptimization="0"
@@ -312,6 +312,14 @@
312312
RelativePath=".\unittestpp.h"
313313
>
314314
</File>
315+
<File
316+
RelativePath=".\XmlTestReporter.cpp"
317+
>
318+
</File>
319+
<File
320+
RelativePath=".\XmlTestReporter.h"
321+
>
322+
</File>
315323
</Files>
316324
<Globals>
317325
</Globals>

‎unittestpp_vs2005.sln

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 9.00
3+
# Visual Studio 2005
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittestpp", "src\unittestpp.vcproj", "{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}"
5+
EndProject
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-unittestpp", "src\tests\test-unittestpp.vcproj", "{9CCC3439-309E-4E85-B3B8-CE704D385D48}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6} = {64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}
9+
EndProjectSection
10+
EndProject
11+
Global
12+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
13+
Debug|Win32 = Debug|Win32
14+
Release|Win32 = Release|Win32
15+
EndGlobalSection
16+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
17+
{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Debug|Win32.ActiveCfg = Debug|Win32
18+
{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Debug|Win32.Build.0 = Debug|Win32
19+
{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Release|Win32.ActiveCfg = Release|Win32
20+
{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}.Release|Win32.Build.0 = Release|Win32
21+
{9CCC3439-309E-4E85-B3B8-CE704D385D48}.Debug|Win32.ActiveCfg = Debug|Win32
22+
{9CCC3439-309E-4E85-B3B8-CE704D385D48}.Debug|Win32.Build.0 = Debug|Win32
23+
{9CCC3439-309E-4E85-B3B8-CE704D385D48}.Release|Win32.ActiveCfg = Release|Win32
24+
{9CCC3439-309E-4E85-B3B8-CE704D385D48}.Release|Win32.Build.0 = Release|Win32
25+
EndGlobalSection
26+
GlobalSection(SolutionProperties) = preSolution
27+
HideSolutionNode = FALSE
28+
EndGlobalSection
29+
EndGlobal

0 commit comments

Comments
 (0)