Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 7663015: Fix ChromeFrame net tests hang on the windows try bots (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/net/fake_external_tab.cc
===================================================================
--- chrome_frame/test/net/fake_external_tab.cc (revision 96788)
+++ chrome_frame/test/net/fake_external_tab.cc (working copy)
@@ -578,5 +578,11 @@
base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL);
base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL);
+ // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which
+ // check if globals are created and destroyed on the same thread don't fire.
+ // Webkit global objects are created on the inproc renderer thread.
+#if !defined(NDEBUG)
+ ExitProcess(test_suite.test_result());
+#endif // NDEBUG
return test_suite.test_result();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698