Bug 981126 - Prevent glxtest child process from executing the normal shutdown sequence. r=bgirard, r=jrmuizel

--HG--
extra : rebase_source : b28d660a9959895f743515f64381e4a5e0bb2c74

toolkit/xre/glxtest.cpp

@@ -260,12 +260,14 @@ bool fire_glxtest_process()
       close(pfd[1]);
       return false;
   }
+  // The child exits early to avoid running the full shutdown sequence and avoid conflicting with threads 
+  // we have already spawned (like the profiler).
   if (pid == 0) {
       close(pfd[0]);
       write_end_of_the_pipe = pfd[1];
       glxtest();
       close(pfd[1]);
-      return true;
+      exit(0);
   }
 
   close(pfd[1]);

toolkit/xre/nsAppRunner.cpp

@@ -2851,10 +2851,10 @@ XREMain::XRE_mainInit(bool* aExitFlag)
   // error handling. indeed, this process is expected to be crashy, and we
   // don't want the user to see its crashes. That's the whole reason for
   // doing this in a separate process.
-  if (fire_glxtest_process()) {
-    *aExitFlag = true;
-    return 0;
-  }
+  //
+  // This call will cause a fork and the fork will terminate itself separately
+  // from the usual shutdown sequence
+  fire_glxtest_process();
 #endif
 
 #if defined(XP_WIN) && defined(MOZ_METRO)