summaryrefslogtreecommitdiffstats
path: root/chrome/browser/debugger
diff options
context:
space:
mode:
authortonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 18:17:35 +0000
committertonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 18:17:35 +0000
commit2318c41495401b66857b659909bfee65a851f00c (patch)
treead525893750b76f35762d9a4652a8c5f63a5fecf /chrome/browser/debugger
parent1677d2607656cedbcdf3e0c196e916ae80978bef (diff)
downloadchromium_src-2318c41495401b66857b659909bfee65a851f00c.zip
chromium_src-2318c41495401b66857b659909bfee65a851f00c.tar.gz
chromium_src-2318c41495401b66857b659909bfee65a851f00c.tar.bz2
Disable TestStepOut and TestStepIn on win because they timeout.
r48279 did this for TestStepOver, but all of the TestStep* tests are timing out on win, not just TestStepOver. TEST=DevToolsSanityTest.TestStep* BUG=45080 Review URL: http://codereview.chromium.org/2240003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 6c8f136..67f1f58 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -380,8 +380,11 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepOver) {
RunTest("testStepOver", kDebuggerStepTestPage);
}
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
-// See http://crbug.com/43479 and http://crbug.com/45080
+#if defined(OS_WIN)
+// Disabled because it times out. See http://crbug.com/45080
+#define MAYBE_TestStepOut DISABLED_TestStepOut
+#elif defined(OS_CHROMEOS) || defined(OS_LINUX)
+// See http://crbug.com/43479
#define MAYBE_TestStepOut FLAKY_TestStepOut
#else
#define MAYBE_TestStepOut TestStepOut
@@ -391,8 +394,11 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepOut) {
RunTest("testStepOut", kDebuggerStepTestPage);
}
-#if defined(OS_CHROMEOS) || defined(OS_WIN)
-// See http://crbug.com/43479 and http://crbug.com/45080
+#if defined(OS_WIN)
+// Disabled because it times out. See http://crbug.com/45080
+#define MAYBE_TestStepIn DISABLED_TestStepIn
+#elif defined(OS_CHROMEOS)
+// See http://crbug.com/43479
#define MAYBE_TestStepIn FLAKY_TestStepIn
#else
#define MAYBE_TestStepIn TestStepIn