Added new type of unit test, RAW_UNIT_TEST_CASE, which is used for tests that can be flaky if run w…

runtime/vm/malloc_hooks_test.cc

Index: runtime/vm/malloc_hooks_test.cc
diff --git a/runtime/vm/malloc_hooks_test.cc b/runtime/vm/malloc_hooks_test.cc
index b0c5d361228f27db9c2e9d4d010d4c5f9044b816..f136d0a45fea643d9c8ce783aeb44b0067742275 100644
--- a/runtime/vm/malloc_hooks_test.cc
+++ b/runtime/vm/malloc_hooks_test.cc
@@ -15,9 +15,6 @@
 
 namespace dart {
 
-// Note: for these tests, there is no need to call MallocHooks::Init() or
-// MallocHooks::TearDown() as this is all done by the VM test framework.
-
 static void MallocHookTestBufferInitializer(volatile char* buffer,
                                             uintptr_t size) {
   // Run through the buffer and do something. If we don't do this and the memory
@@ -28,11 +25,11 @@ static void MallocHookTestBufferInitializer(volatile char* buffer,
 }
 
 
-UNIT_TEST_CASE(BasicMallocHookTest) {
+RAW_VM_UNIT_TEST_CASE(BasicMallocHookTest) {

[rmacnak, 2017/01/31 22:44:39]

There's no VM :)
RAW_UNIT_TEST or UNIT_TEST_NO_VM, etc.

[bkonyi, 2017/01/31 22:57:18]

Oops, apparently my sed-foo needs some work... I've changed these to
UNIT_TEST_CASE.

+  MallocHooks::InitOnce();
   MallocHooks::ResetStats();
   EXPECT_EQ(0L, MallocHooks::allocation_count());
   EXPECT_EQ(0L, MallocHooks::heap_allocated_memory_in_bytes());
-
   const intptr_t buffer_size = 10;
   char* buffer = new char[buffer_size];
   MallocHookTestBufferInitializer(buffer, buffer_size);
@@ -44,10 +41,12 @@ UNIT_TEST_CASE(BasicMallocHookTest) {
   delete[] buffer;
   EXPECT_EQ(0L, MallocHooks::allocation_count());
   EXPECT_EQ(0L, MallocHooks::heap_allocated_memory_in_bytes());
+  MallocHooks::TearDown();
 }
 
 
-UNIT_TEST_CASE(FreeUnseenMemoryMallocHookTest) {
+RAW_VM_UNIT_TEST_CASE(FreeUnseenMemoryMallocHookTest) {
+  MallocHooks::InitOnce();
   const intptr_t pre_hook_buffer_size = 3;
   char* pre_hook_buffer = new char[pre_hook_buffer_size];
   MallocHookTestBufferInitializer(pre_hook_buffer, pre_hook_buffer_size);
@@ -73,6 +72,7 @@ UNIT_TEST_CASE(FreeUnseenMemoryMallocHookTest) {
   delete[] buffer;
   EXPECT_EQ(0L, MallocHooks::allocation_count());
   EXPECT_EQ(0L, MallocHooks::heap_allocated_memory_in_bytes());
+  MallocHooks::TearDown();
 }
 
 };  // namespace dart