summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-18 04:34:47 +0000
committerdimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-18 04:34:47 +0000
commit9b63b17555aea45ce48216a726a227906e4d2767 (patch)
tree7427fef84a12b3693037778aec1a28b856638ee2
parentf7b32ad69f31b5c9e0967dfe8815a02e7f49a999 (diff)
downloadchromium_src-9b63b17555aea45ce48216a726a227906e4d2767.zip
chromium_src-9b63b17555aea45ce48216a726a227906e4d2767.tar.gz
chromium_src-9b63b17555aea45ce48216a726a227906e4d2767.tar.bz2
Attempt to fix Linux interactive tests.
TBR=pfeldman BUG=none TEST=none Review URL: http://codereview.chromium.org/6348005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71626 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index d02da6f..8fefc7b 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -324,7 +324,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
// Fails after WebKit roll 75765:75812 (likely 75791), http://crbug.com/69719
#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_TestPauseWhenLoadingDevTools FAILS_TestPauseWhenLoadingDevTools
+#define MAYBE_TestPauseWhenLoadingDevTools DISABLED_TestPauseWhenLoadingDevTools
#else
#define MAYBE_TestPauseWhenLoadingDevTools TestPauseWhenLoadingDevTools
#endif // defined(OS_LINUX) || defined(OS_WIN)
@@ -336,7 +336,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestPauseWhenLoadingDevTools) {
// Fails after WebKit roll 75765:75812 (likely 75791), http://crbug.com/69719
#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_TestPauseWhenScriptIsRunning FAILS_TestPauseWhenScriptIsRunning
+#define MAYBE_TestPauseWhenScriptIsRunning DISABLED_TestPauseWhenScriptIsRunning
#else
#define MAYBE_TestPauseWhenScriptIsRunning TestPauseWhenScriptIsRunning
#endif // defined(OS_LINUX) || defined(OS_WIN)