summaryrefslogtreecommitdiffstats
path: root/content/test/content_browser_test.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-08 19:47:13 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-08 19:47:13 +0000
commit0f2a226da0a715bd52c5d88fb9ec6a18eac4cc1c (patch)
tree213996df2ebd030cf05a95b47a878b3a10031e2c /content/test/content_browser_test.cc
parent5df702fec6505f5f0a94deca1c4cc76cee7a535a (diff)
downloadchromium_src-0f2a226da0a715bd52c5d88fb9ec6a18eac4cc1c.zip
chromium_src-0f2a226da0a715bd52c5d88fb9ec6a18eac4cc1c.tar.gz
chromium_src-0f2a226da0a715bd52c5d88fb9ec6a18eac4cc1c.tar.bz2
Don't print the callstack in forked browser test processes. This may allocate memory or try to acquire OS locks which may already be locked from the parent process. This was happening because there's a race condition where the browser process forks a process and shuts it down very soon after, before it calls exec*.
BUG=141302,139209,36678 Review URL: https://chromiumcodereview.appspot.com/10836148 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_browser_test.cc')
-rw-r--r--content/test/content_browser_test.cc20
1 files changed, 0 insertions, 20 deletions
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc
index 0fab44b..fb484c5 100644
--- a/content/test/content_browser_test.cc
+++ b/content/test/content_browser_test.cc
@@ -5,7 +5,6 @@
#include "content/test/content_browser_test.h"
#include "base/command_line.h"
-#include "base/debug/stack_trace.h"
#include "base/file_path.h"
#include "base/logging.h"
#include "base/message_loop.h"
@@ -50,11 +49,6 @@ void ContentBrowserTest::SetUp() {
CommandLine* command_line = CommandLine::ForCurrentProcess();
command_line->AppendSwitch(switches::kContentBrowserTest);
-#if defined(OS_LINUX)
- // http://crbug.com/139209
- command_line->AppendSwitch(switches::kDisableGpuProcessPrelaunch);
-#endif
-
SetUpCommandLine(command_line);
// Single-process mode is not set in BrowserMain, so process it explicitly,
@@ -87,24 +81,10 @@ void ContentBrowserTest::TearDown() {
shell_main_delegate_.reset();
}
-#if defined(OS_POSIX)
-// On SIGTERM (sent by the runner on timeouts), dump a stack trace (to make
-// debugging easier) and also exit with a known error code (so that the test
-// framework considers this a failure -- http://crbug.com/57578).
-static void DumpStackTraceSignalHandler(int signal) {
- base::debug::StackTrace().PrintBacktrace();
- _exit(128 + signal);
-}
-#endif // defined(OS_POSIX)
-
void ContentBrowserTest::RunTestOnMainThreadLoop() {
CHECK_EQ(Shell::windows().size(), 1u);
shell_ = Shell::windows()[0];
-#if defined(OS_POSIX)
- signal(SIGTERM, DumpStackTraceSignalHandler);
-#endif // defined(OS_POSIX)
-
#if defined(OS_MACOSX)
// On Mac, without the following autorelease pool, code which is directly
// executed (as opposed to executed inside a message loop) would autorelease