diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 18:39:02 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 18:39:02 +0000 |
| commit | 5f31c18bb4f01034c9b6076746cd98f56ab9c196 (patch) | |
| tree | 7baf6a6dfbf9cb992d6b8f79b5b37ef0af96e944 /chrome_frame | |
| parent | eaac715956492f57bae3f30957662aca56462abe (diff) | |
| download | chromium_src-5f31c18bb4f01034c9b6076746cd98f56ab9c196.zip chromium_src-5f31c18bb4f01034c9b6076746cd98f56ab9c196.tar.gz chromium_src-5f31c18bb4f01034c9b6076746cd98f56ab9c196.tar.bz2 | |
Disabling chrome frame net tests on IE9 as they are flaky.
TBR=robertshield
BUG=none
TEST=chrome frame net tests should not run on IE9
Review URL: http://codereview.chromium.org/8679012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 81d6c0b..b33ad1e 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -587,6 +587,16 @@ const char* IEVersionToString(IEVersion version) { } int main(int argc, char** argv) { + if (chrome_frame_test::GetInstalledIEVersion() >= IE_9) { + // Adding this here as the command line and the logging stuff gets + // initialized in the NetTestSuite constructor. Did not want to break that. + base::AtExitManager at_exit_manager; + CommandLine::Init(argc, argv); + CFUrlRequestUnittestRunner::InitializeLogging(); + LOG(INFO) << "Not running ChromeFrame net tests on IE9+"; + return 0; + } + google_breakpad::scoped_ptr<google_breakpad::ExceptionHandler> breakpad( InitializeCrashReporting(HEADLESS)); |