Merge 9500d53 into bcabc12

cpputest · Apr 27, 2016 · ac44d17 · ac44d17
2 parents bcabc12 + 9500d53
commit ac44d17
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 26 deletions.
diff --git a/CppUTest.vcproj b/CppUTest.vcproj
@@ -226,6 +226,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\src\CppUTestExt\IEEE754ExceptionsPlugin.cpp"
+				>
+			</File>
 			<File
 				RelativePath="SRC\CPPUTEST\JUnitTestOutput.cpp"
 				>
@@ -249,7 +253,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="SRC\CPPUTEST\TeamCityTestOutput.cpp"
+				RelativePath="SRC\CPPUTEST\MemoryLeakDetector.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -271,7 +275,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="SRC\CPPUTEST\MemoryLeakDetector.cpp"
+				RelativePath="SRC\CPPUTEST\MemoryLeakWarningPlugin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -293,7 +297,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="SRC\CPPUTEST\MemoryLeakWarningPlugin.cpp"
+				RelativePath="src\CppUTestExt\MemoryReportAllocator.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -315,7 +319,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MemoryReportAllocator.cpp"
+				RelativePath="src\CppUTestExt\MemoryReporterPlugin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -337,7 +341,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MemoryReporterPlugin.cpp"
+				RelativePath="src\CppUTestExt\MemoryReportFormatter.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -359,7 +363,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MemoryReportFormatter.cpp"
+				RelativePath="src\CppUTestExt\MockActualCall.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -381,7 +385,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MockActualCall.cpp"
+				RelativePath="src\CppUTestExt\MockExpectedCall.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -403,7 +407,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MockExpectedCall.cpp"
+				RelativePath="src\CppUTestExt\MockExpectedCallsList.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -425,7 +429,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MockExpectedCallsList.cpp"
+				RelativePath="src\CppUTestExt\MockFailure.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -447,7 +451,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MockFailure.cpp"
+				RelativePath="src\CppUTestExt\MockNamedValue.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -469,7 +473,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MockNamedValue.cpp"
+				RelativePath="src\CppUTestExt\MockSupport.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -491,7 +495,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MockSupport.cpp"
+				RelativePath="src\CppUTestExt\MockSupport_c.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -513,7 +517,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MockSupport_c.cpp"
+				RelativePath="src\CppUTestExt\MockSupportPlugin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -535,7 +539,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\MockSupportPlugin.cpp"
+				RelativePath="src\CppUTestExt\OrderedTest.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -557,7 +561,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\CppUTestExt\OrderedTest.cpp"
+				RelativePath="SRC\CPPUTEST\SimpleMutex.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -579,7 +583,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="SRC\CPPUTEST\SimpleMutex.cpp"
+				RelativePath="SRC\CPPUTEST\SimpleString.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -601,7 +605,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="SRC\CPPUTEST\SimpleString.cpp"
+				RelativePath="SRC\CPPUTEST\TeamCityTestOutput.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -851,10 +855,18 @@
 				RelativePath="include\CppUTestExt\CodeMemoryReportFormatter.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTest\CommandLineArguments.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTest\CommandLineTestRunner.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTest\CppUTestConfig.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTest\EqualsFailure.h"
 				>
@@ -871,10 +883,26 @@
 				RelativePath="include\CppUTestExt\GTestConvertor.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTestExt\IEEE754ExceptionsPlugin.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTest\JunitTestOutput.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTest\MemoryLeakDetector.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUTest\MemoryLeakDetectorMallocMacros.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUTest\MemoryLeakDetectorNewMacros.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTest\MemoryLeakWarning.h"
 				>
@@ -895,6 +923,10 @@
 				RelativePath="include\CppUTestExt\MemoryReportFormatter.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTestExt\MockActualCall.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTestExt\MockCheckedActualCall.h"
 				>
@@ -903,6 +935,10 @@
 				RelativePath="include\CppUTestExt\MockCheckedExpectedCall.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTestExt\MockExpectedCall.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTestExt\MockExpectedCallsList.h"
 				>
@@ -943,10 +979,22 @@
 				RelativePath="src\Platforms\VisualCpp\Platform.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTest\PlatformSpecificFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUTest\PlatformSpecificFunctions_c.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTest\RealTestOutput.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTest\SimpleMutex.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTest\SimpleString.h"
 				>
@@ -955,6 +1003,22 @@
 				RelativePath="include\CppUTest\SimpleStringExtensions.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTest\StandardCLibrary.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUTest\TeamCityTestOutput.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUTest\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUTest\TestFilter.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTest\TestHarness.h"
 				>
@@ -967,6 +1031,10 @@
 				RelativePath="include\CppUTest\TestInstaller.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTest\TestMemoryAllocator.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTest\TestOutput.h"
 				>
@@ -983,10 +1051,18 @@
 				RelativePath="include\CppUTest\TestResult.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTest\TestTestingFixture.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTest\Utest.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\CppUTest\UtestMacros.h"
+				>
+			</File>
 			<File
 				RelativePath="include\CppUTest\VirtualCall.h"
 				>

diff --git a/CppUTest.vcxproj b/CppUTest.vcxproj
@@ -112,6 +112,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\CppUTestExt\CodeMemoryReportFormatter.cpp" />
+    <ClCompile Include="src\CppUTestExt\IEEE754ExceptionsPlugin.cpp" />
     <ClCompile Include="src\CppUTestExt\MemoryReportAllocator.cpp" />
     <ClCompile Include="src\CppUTestExt\MemoryReporterPlugin.cpp" />
     <ClCompile Include="src\CppUTestExt\MemoryReportFormatter.cpp" />
@@ -152,6 +153,7 @@
     <ClInclude Include="include\CppUTestExt\GMock.h" />
     <ClInclude Include="include\CppUTestExt\GTest.h" />
     <ClInclude Include="include\CppUTestExt\GTestConvertor.h" />
+    <ClInclude Include="include\cpputestext\ieee754exceptionsplugin.h" />
     <ClInclude Include="include\CppUTestExt\MemoryReportAllocator.h" />
     <ClInclude Include="include\CppUTestExt\MemoryReporterPlugin.h" />
     <ClInclude Include="include\CppUTestExt\MemoryReportFormatter.h" />
@@ -168,7 +170,9 @@
     <ClInclude Include="include\CppUTestExt\OrderedTest.h" />
     <ClInclude Include="include\CppUTest\CommandLineArguments.h" />
     <ClInclude Include="include\CppUTest\CommandLineTestRunner.h" />
+    <ClInclude Include="include\cpputest\cpputestconfig.h" />
     <ClInclude Include="include\CppUTest\JUnitTestOutput.h" />
+    <ClInclude Include="include\cpputest\platformspecificfunctions_c.h" />
     <ClInclude Include="include\CppUTest\TeamCityTestOutput.h" />
     <ClInclude Include="include\CppUTest\MemoryLeakDetector.h" />
     <ClInclude Include="include\CppUTest\MemoryLeakDetectorMallocMacros.h" />

diff --git a/include/CppUTest/CppUTestConfig.h b/include/CppUTest/CppUTestConfig.h
@@ -169,9 +169,10 @@
 
 /*
  * Handling of IEEE754 floating point exceptions via fenv.h
+ * Works on non-Visual C++ compilers and Visual C++ 2008 and newer
  */
 
-#if CPPUTEST_USE_STD_C_LIB
+#if CPPUTEST_USE_STD_C_LIB && (!defined(_MSC_VER) || (_MSC_VER >= 1800))
 #define CPPUTEST_HAVE_FENV
 #if defined(__WATCOMC__)
 #define CPPUTEST_FENV_IS_WORKING_PROPERLY 0