Merge pull request #1068 from felipe-lavratti/macos_ieee_fix_squashed

Removing IEEE754 implementation from Mac OSx
cpputest · Dec 8, 2016 · 4949236 · 4949236
2 parents 7e9ff45 + fa783f7
commit 4949236
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 2 deletions.
diff --git a/examples/AllTests/FEDemoTest.cpp b/examples/AllTests/FEDemoTest.cpp
@@ -28,9 +28,9 @@
 #include "CppUTest/CommandLineTestRunner.h"
 #include "CppUTest/TestHarness.h"
 #include "CppUTest/TestRegistry.h"
-#include "CppUTestExt/IEEE754ExceptionsPlugin.h"
 
 #ifdef CPPUTEST_HAVE_FENV
+#include "CppUTestExt/IEEE754ExceptionsPlugin.h"
 
 /*
  * To see a demonstration of tests failing as a result of IEEE754ExceptionsPlugin

diff --git a/include/CppUTest/CppUTestConfig.h b/include/CppUTest/CppUTestConfig.h
@@ -172,7 +172,7 @@
  * Works on non-Visual C++ compilers and Visual C++ 2008 and newer
  */
 
-#if CPPUTEST_USE_STD_C_LIB && (!defined(_MSC_VER) || (_MSC_VER >= 1800))
+#if CPPUTEST_USE_STD_C_LIB && (!defined(_MSC_VER) || (_MSC_VER >= 1800)) && (!defined(__APPLE__))
 #define CPPUTEST_HAVE_FENV
 #if defined(__WATCOMC__) || defined(__ARMEL__) || defined(__m68k__)
 #define CPPUTEST_FENV_IS_WORKING_PROPERLY 0

diff --git a/src/CppUTestExt/IEEE754ExceptionsPlugin.cpp b/src/CppUTestExt/IEEE754ExceptionsPlugin.cpp
@@ -100,4 +100,54 @@ void IEEE754ExceptionsPlugin::ieee754Check(UtestShell& test, TestResult& result,
     }
 }
 
+#else
+
+
+bool IEEE754ExceptionsPlugin::inexactDisabled_ = true;
+
+IEEE754ExceptionsPlugin::IEEE754ExceptionsPlugin(const SimpleString& name)
+    : TestPlugin(name)
+{
+}
+
+void IEEE754ExceptionsPlugin::preTestAction(UtestShell&, TestResult&)
+{
+}
+
+void IEEE754ExceptionsPlugin::postTestAction(UtestShell&, TestResult&)
+{
+}
+
+void IEEE754ExceptionsPlugin::disableInexact()
+{
+}
+
+void IEEE754ExceptionsPlugin::enableInexact()
+{
+}
+
+bool IEEE754ExceptionsPlugin::checkIeee754OverflowExceptionFlag()
+{
+    return false;
+}
+
+bool IEEE754ExceptionsPlugin::checkIeee754UnderflowExceptionFlag()
+{
+    return false;
+}
+
+bool IEEE754ExceptionsPlugin::checkIeee754InexactExceptionFlag()
+{
+    return false;
+}
+
+bool IEEE754ExceptionsPlugin::checkIeee754DivByZeroExceptionFlag()
+{
+    return false;
+}
+
+void IEEE754ExceptionsPlugin::ieee754Check(UtestShell&, TestResult&, int, const char*)
+{
+}
+
 #endif
diff --git a/tests/CppUTestExt/IEEE754PluginTest.cpp b/tests/CppUTestExt/IEEE754PluginTest.cpp
@@ -31,6 +31,7 @@
 #include "CppUTest/TestTestingFixture.h"
 #include "CppUTestExt/IEEE754ExceptionsPlugin.h"
 
+#ifdef CPPUTEST_HAVE_FENV
 #if CPPUTEST_FENV_IS_WORKING_PROPERLY
 
 extern "C"
@@ -143,3 +144,4 @@ IGNORE_TEST(IEEE754ExceptionsPlugin2, should_not_fail_in_ignored_test)
 }
 
 #endif
+#endif