summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-03 14:56:40 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-03 14:56:40 +0000
commitf0f67736354e2e0162811a2308d7f2853ec81eb9 (patch)
tree0f78d58eb63a043d7979f2ba6ede26cc44eaf5d5
parent50e4d108e53f020aa8029bde69280a41c33f6a9c (diff)
downloadchromium_src-f0f67736354e2e0162811a2308d7f2853ec81eb9.zip
chromium_src-f0f67736354e2e0162811a2308d7f2853ec81eb9.tar.gz
chromium_src-f0f67736354e2e0162811a2308d7f2853ec81eb9.tar.bz2
Disable ChromeFrameTestWithWebServer.WidgetModeIE_CFInstanceRPC in Debug builds.
Because it consistently fails and times out. BUG=112599 TEST=none TBR=robertshield@chromium.org Review URL: https://chromiumcodereview.appspot.com/9325027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120329 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome_frame/test/test_with_web_server.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index f5e92a1..fc758dd 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -495,7 +495,14 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstancePost) {
const wchar_t kCFIRPCPage[] = L"CFInstance_rpc_host.html";
-TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceRPC) {
+// This test consistently times out in debug builds; see http://crbug.com/112599
+#ifndef NDEBUG
+#define MAYBE_WidgetModeIE_CFInstanceRPC DISABLED_WidgetModeIE_CFInstanceRPC
+#else
+#define MAYBE_WidgetModeIE_CFInstanceRPC WidgetModeIE_CFInstanceRPC
+#endif
+
+TEST_F(ChromeFrameTestWithWebServer, MAYBE_WidgetModeIE_CFInstanceRPC) {
if (chrome_frame_test::GetInstalledIEVersion() == IE_9) {
LOG(INFO) << "Not running test on Vista/Windows 7 with IE9";
return;