diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 22:24:18 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 22:24:18 +0000 |
| commit | 4a91d85a0201d32309bf4523a02db44cc292ca12 (patch) | |
| tree | a893bf5f8e61153f080fa714d4793647a994cef8 /chrome_frame | |
| parent | 07e0fa47f369da3e4f4694ec9871850f8e8162b1 (diff) | |
| download | chromium_src-4a91d85a0201d32309bf4523a02db44cc292ca12.zip chromium_src-4a91d85a0201d32309bf4523a02db44cc292ca12.tar.gz chromium_src-4a91d85a0201d32309bf4523a02db44cc292ca12.tar.bz2 | |
Ensure that webkit ASSERTION's don't fire during CRT cleanup in debug runs of the chrome frame net tests suite by
terminating the exe using ExitProcess in debug builds.
These cause the exe to crash during exit, thus turning the windows try bot runs red.
BUG=none
TEST=chrome frame net tests should run to completion without crashing in debug runs.
Review URL: http://codereview.chromium.org/7663015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 5acd9f4..2bd4fbd 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -578,5 +578,11 @@ int main(int argc, char** argv) { 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(); } |