Merge pull request #1868 from basvodde/master

Moved the allocation outside the compile unit to avoid optimising the new away

Author: basvodde

tests/CppUTest/AllocationInCppFile.cpp

@@ -27,6 +27,34 @@ char* newArrayAllocationWithoutMacro()
     return new char[100];
 }
 
+int* newIntAllocationWithoutMacro()
+{
+    return new int;
+}
+
+int* newIntNoThowAllocationWithoutMacro()
+{
+#if CPPUTEST_USE_STD_CPP_LIB
+    return new (std::nothrow) int;
+#else
+    return new int;
+#endif
+}
+
+char* newCharArrayAllocationWithoutMacro()
+{
+    return new char[20];
+}
+
+char* newCharArrayNoThrowAllocationWithoutMacro()
+{
+#if CPPUTEST_USE_STD_CPP_LIB
+    return new (std::nothrow) char[20];
+#else
+    return new char[20];
+#endif
+}
+
 #if CPPUTEST_HAVE_EXCEPTIONS
 
 ClassThatThrowsAnExceptionInTheConstructor::ClassThatThrowsAnExceptionInTheConstructor()

tests/CppUTest/AllocationInCppFile.h

@@ -7,6 +7,11 @@ char* newArrayAllocation();
 char* newAllocationWithoutMacro();
 char* newArrayAllocationWithoutMacro();
 
+int* newIntAllocationWithoutMacro();
+int* newIntNoThowAllocationWithoutMacro();
+char* newCharArrayAllocationWithoutMacro();
+char* newCharArrayNoThrowAllocationWithoutMacro();
+
 #if CPPUTEST_HAVE_EXCEPTIONS
 
 class ClassThatThrowsAnExceptionInTheConstructor

tests/CppUTest/MemoryLeakWarningTest.cpp

@@ -35,6 +35,7 @@
 #include "CppUTest/TestHarness_c.h"
 #include "CppUTest/SimpleMutex.h"
 #include "DummyMemoryLeakDetector.h"
+#include "AllocationInCppFile.h"
 
 TEST_GROUP(MemoryLeakWarningLocalDetectorTest)
 {
@@ -471,28 +472,17 @@ TEST(MemoryLeakWarningThreadSafe, turnOnThreadSafeNewDeleteOverloadsDebug)
     MemoryLeakWarningPlugin::turnOnDefaultNotThreadSafeNewDeleteOverloads();
 }
 
-#ifdef __clang__
-
-IGNORE_TEST(MemoryLeakWarningThreadSafe, turnOnThreadSafeNewDeleteOverloads)
-{
-    /*  Clang misbehaves with -O2 - it will not overload operator new or
-     *  operator new[] no matter what. Therefore, this test is must be ignored.
-     */
-}
-
-#else
-
 TEST(MemoryLeakWarningThreadSafe, turnOnThreadSafeNewDeleteOverloads)
 {
 #undef new
 
     size_t storedAmountOfLeaks = MemoryLeakWarningPlugin::getGlobalDetector()->totalMemoryLeaks(mem_leak_period_all);
     MemoryLeakWarningPlugin::turnOnThreadSafeNewDeleteOverloads();
 
-    int *n = new int;
-    int *n_nothrow = new (std::nothrow) int;
-    char *str = new char[20];
-    char *str_nothrow = new (std::nothrow) char[20];
+    int *n = newIntAllocationWithoutMacro();
+    int *n_nothrow = newIntNoThowAllocationWithoutMacro();
+    char *str = newCharArrayAllocationWithoutMacro();
+    char *str_nothrow = newCharArrayNoThrowAllocationWithoutMacro();
 
     LONGS_EQUAL(storedAmountOfLeaks + 4, MemoryLeakWarningPlugin::getGlobalDetector()->totalMemoryLeaks(mem_leak_period_all));
     CHECK_EQUAL(4, mutexLockCount);
@@ -516,5 +506,3 @@ TEST(MemoryLeakWarningThreadSafe, turnOnThreadSafeNewDeleteOverloads)
 #endif
 
 #endif
-
-#endif