summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authormmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-06 22:30:15 +0000
committermmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-06 22:30:15 +0000
commit0ceef5ae9397731cd3bc105c471bf0d6fc1dca1e (patch)
treec34abea6c67948cb9373536b592afc7db486bb9b /webkit
parent5cf8bdeb18b6d7a3e0327d1f012391cabb9abe85 (diff)
downloadchromium_src-0ceef5ae9397731cd3bc105c471bf0d6fc1dca1e.zip
chromium_src-0ceef5ae9397731cd3bc105c471bf0d6fc1dca1e.tar.gz
chromium_src-0ceef5ae9397731cd3bc105c471bf0d6fc1dca1e.tar.bz2
Force Linux test_shell timeout alarm to log to its own line.
This fixes a problem where the alarm would sometimes trigger during a lengthy stacktrace dump, which would interrupt the dump and write the log message "hidden" within the dump output, which would cause the timeout check in test_shell_thread.py to fail, which would cause the test to hang until killed. Review URL: http://codereview.chromium.org/525049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell_gtk.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 7af5fe0..3cbbf37 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -430,7 +430,7 @@ void TestShell::SizeTo(int width, int height) {
static void AlarmHandler(int signatl) {
// If the alarm alarmed, kill the process since we have a really bad hang.
- puts("#TEST_TIMED_OUT\n");
+ puts("\n#TEST_TIMED_OUT\n");
puts("#EOF\n");
fflush(stdout);
TestShell::ShutdownTestShell();