summaryrefslogtreecommitdiffstats
path: root/chrome/common/logging_chrome_uitest.cc
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 23:20:09 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 23:20:09 +0000
commitaa443bbd00b53fe0701de2ca18e4f5f3acf5c25c (patch)
tree69e61525cec8890ee6cd1612e841ef661f1f1587 /chrome/common/logging_chrome_uitest.cc
parenta94a03acc534fa15a278f4b6ed8f3cba8a737679 (diff)
downloadchromium_src-aa443bbd00b53fe0701de2ca18e4f5f3acf5c25c.zip
chromium_src-aa443bbd00b53fe0701de2ca18e4f5f3acf5c25c.tar.gz
chromium_src-aa443bbd00b53fe0701de2ca18e4f5f3acf5c25c.tar.bz2
Revert 56738 - Fix CheckFalseTest.CheckFails on Linux after my change to ui_test.
This makes PathService clear its cache after overriding a path. We have many paths depending on each other, so this is necessary to avoid inconsistencies. TEST=ui_tests in Release mode BUG=49838 Review URL: http://codereview.chromium.org/2805100 TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3169031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/logging_chrome_uitest.cc')
-rw-r--r--chrome/common/logging_chrome_uitest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
index 216f156..328a5a49 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -130,6 +130,9 @@ class CheckFalseTest : public UITest {
#elif defined(OS_MACOSX)
// Crash service doesn't exist for the Mac yet: http://crbug.com/45243
#define CheckFails DISABLED_CheckFails
+#elif defined(OS_LINUX)
+// TODO(phajdan) Fix this - http://crbug.com/49838
+#define CheckFails FAILS_CheckFails
#endif
// Launch the app in assertion test mode, then close the app.
TEST_F(CheckFalseTest, CheckFails) {