summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-06 12:25:29 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-06 12:25:29 +0000
commit91923177adfac164555e12ef4830a2ae5893d642 (patch)
tree3a1e1dd679a1dbc7e5ef9a8ef1bc0312452a1261
parentc36827ed54344c82a45f205fe908b12c91f1b388 (diff)
downloadchromium_src-91923177adfac164555e12ef4830a2ae5893d642.zip
chromium_src-91923177adfac164555e12ef4830a2ae5893d642.tar.gz
chromium_src-91923177adfac164555e12ef4830a2ae5893d642.tar.bz2
Failed on Builder Interactive Tests (dbg)
BUG=54592 TEST=interactive_ui_tests TBR=zmo Review URL: http://codereview.chromium.org/3337014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58633 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index d38b86b..a93e1b2 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -331,22 +331,22 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
// Tests set breakpoint.
// Fails after WebKit roll 66724:66804, http://crbug.com/54592
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_WIN)
#define MAYBE_TestSetBreakpoint FAILS_TestSetBreakpoint
#else
#define MAYBE_TestSetBreakpoint TestSetBreakpoint
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestSetBreakpoint) {
RunTest("testSetBreakpoint", kDebuggerTestPage);
}
// Tests pause on exception.
// Fails after WebKit roll 66724:66804, http://crbug.com/54592
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_WIN)
#define MAYBE_TestPauseOnException FAILS_TestPauseOnException
#else
#define MAYBE_TestPauseOnException TestPauseOnException
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestPauseOnException) {
RunTest("testPauseOnException", kPauseOnExceptionTestPage);
}
@@ -383,11 +383,11 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestAutoContinueOnSyntaxError) {
}
// Fails after WebKit roll 66724:66804, http://crbug.com/54592
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_WIN)
#define MAYBE_TestCompletionOnPause FAILS_TestCompletionOnPause
#else
#define MAYBE_TestCompletionOnPause TestCompletionOnPause
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestCompletionOnPause) {
RunTest("testCompletionOnPause", kCompletionOnPause);
}