Backed out changeset b1ce6a65a214 (bug 1414318) for failing xpcshell on toolkit/components/terminator/tests/xpcshell/test_terminator_record.js r=backout on a CLOSED TREE
authorCoroiu Cristina <ccoroiu@mozilla.com>
Tue, 07 Nov 2017 03:12:25 +0200
changeset 390415 0418d4d4a91ef989fb18d56a1b30e2a6e413cec5
parent 390414 01af8ee498fcaf66a75feb59fcbcc3067f7138cc
child 390416 e0ad40dad503e8d176512140c32d05513a57e4a9
push id97039
push userccoroiu@mozilla.com
push dateTue, 07 Nov 2017 01:12:58 +0000
treeherdermozilla-inbound@0418d4d4a91e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1414318
milestone58.0a1
backs outb1ce6a65a2141c6ad7f8b3c83333878d976f75c2
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
Backed out changeset b1ce6a65a214 (bug 1414318) for failing xpcshell on toolkit/components/terminator/tests/xpcshell/test_terminator_record.js r=backout on a CLOSED TREE
toolkit/components/terminator/nsTerminator.cpp
toolkit/components/terminator/tests/xpcshell/xpcshell.ini
--- a/toolkit/components/terminator/nsTerminator.cpp
+++ b/toolkit/components/terminator/nsTerminator.cpp
@@ -223,18 +223,17 @@ void RunWriter(void* arg)
   NS_SetCurrentThreadName("Shutdown Statistics Writer");
 
   MOZ_LSAN_INTENTIONALLY_LEAK_OBJECT(arg);
   // Shutdown will generally complete before we have a chance to
   // deallocate. This is not a leak.
 
   // Setup destinationPath and tmpFilePath
 
-  nsCString destinationPath;
-  destinationPath.Adopt(static_cast<char*>(arg));
+  nsCString destinationPath(static_cast<char*>(arg));
   nsAutoCString tmpFilePath;
   tmpFilePath.Append(destinationPath);
   tmpFilePath.AppendLiteral(".tmp");
 
   // Cleanup any file leftover from a previous run
   Unused << PR_Delete(tmpFilePath.get());
   Unused << PR_Delete(destinationPath.get());
 
@@ -357,22 +356,22 @@ nsTerminator::SelfInit()
 }
 
 // Actually launch these threads. This takes place at the first sign of shutdown.
 void
 nsTerminator::Start()
 {
   MOZ_ASSERT(!mInitialized);
   StartWatchdog();
-#if !defined(NS_FREE_PERMANENT_DATA)
-  // Only allow nsTerminator to write on non-leak-checked builds so we don't
-  // get leak warnings on shutdown for intentional leaks (see bug 1242084).
-  // This will be enabled again by bug 1255484 when 1255478 lands.
+#if !defined(DEBUG)
+  // Only allow nsTerminator to write on non-debug builds so we don't get leak warnings on
+  // shutdown for intentional leaks (see bug 1242084). This will be enabled again by bug
+  // 1255484 when 1255478 lands.
   StartWriter();
-#endif // !defined(NS_FREE_PERMANENT_DATA)
+#endif // !defined(DEBUG)
   mInitialized = true;
 }
 
 // Prepare, allocate and start the watchdog thread.
 // By design, it will never finish, nor be deallocated.
 void
 nsTerminator::StartWatchdog()
 {
--- a/toolkit/components/terminator/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/terminator/tests/xpcshell/xpcshell.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
 head=
 
 [test_terminator_record.js]
-skip-if = asan # Disabled by bug 1242084, bug 1255484 will enable it again.
+skip-if = debug # Disabled by bug 1242084, bug 1255484 will enable it again.
 [test_terminator_reload.js]
 skip-if = os == "android"