Bug 1402283 - Fix non-Nightly build bustage. r+a=RyanVM
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 10 Nov 2017 16:55:37 -0500
changeset 444590 50d59c3a291b7144fae5cb68aa1fb6e1493636e5
parent 444589 cb9fd022bf7b28135f55ffbfff7ea7dbed07605e
child 444591 95bb0fe925ede241a79413eb0ed078e0c9c5f901
child 444592 c32f513af0f875fd36d8951d60e05ba00ee2e39f
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1402283
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1402283 - Fix non-Nightly build bustage. r+a=RyanVM
memory/gtest/TestJemalloc.cpp
--- a/memory/gtest/TestJemalloc.cpp
+++ b/memory/gtest/TestJemalloc.cpp
@@ -13,16 +13,17 @@
 #include "gtest/gtest.h"
 
 #ifdef MOZ_CRASHREPORTER
 #include "nsCOMPtr.h"
 #include "nsICrashReporter.h"
 #include "nsServiceManagerUtils.h"
 #endif
 
+#ifdef NIGHTLY_BUILD
 #if defined(DEBUG) && !defined(XP_WIN) && !defined(ANDROID)
 #define HAS_GDB_SLEEP_DURATION 1
 extern unsigned int _gdb_sleep_duration;
 #endif
 
 // Death tests are too slow on OSX because of the system crash reporter.
 #ifndef XP_DARWIN
 static void DisableCrashReporter()
@@ -39,17 +40,18 @@ static void DisableCrashReporter()
 // Wrap ASSERT_DEATH_IF_SUPPORTED to disable the crash reporter
 // when entering the subprocess, so that the expected crashes don't
 // create a minidump that the gtest harness will interpret as an error.
 #define ASSERT_DEATH_WRAP(a, b) \
   ASSERT_DEATH_IF_SUPPORTED({ DisableCrashReporter(); a; }, b)
 #else
 #define ASSERT_DEATH_WRAP(a, b)
 #endif
-
+#endif
+q
 using namespace mozilla;
 
 static inline void
 TestOne(size_t size)
 {
   size_t req = size;
   size_t adv = malloc_good_size(req);
   char* p = (char*)malloc(req);