summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 22:22:52 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 22:22:52 +0000
commit7d8f4d417716d83322ea6f5d7e07c4da2448f63e (patch)
tree23377bb6f6c639f9bf073561668457b81a5fafd7 /tools
parent90aa52b26b0eaaa123a9543bbd51029ddbcb9924 (diff)
downloadchromium_src-7d8f4d417716d83322ea6f5d7e07c4da2448f63e.zip
chromium_src-7d8f4d417716d83322ea6f5d7e07c4da2448f63e.tar.gz
chromium_src-7d8f4d417716d83322ea6f5d7e07c4da2448f63e.tar.bz2
OptionsUITest.LoadOptionsByURL fails on Linux Valgrind
Generalizes disabling of OptionsUITest.LoadOptionsByURL. Seen on Linux. BUG=64619 TEST=Valgrind goes green on Linux bot. TBR=csilv@chromium.org Review URL: http://codereview.chromium.org/7840016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt1
-rw-r--r--tools/valgrind/gtest_exclude/ui_tests.gtest.txt4
-rw-r--r--tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt1
3 files changed, 4 insertions, 2 deletions
diff --git a/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt
index c111f7de..b6e7c75 100644
--- a/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt
+++ b/tools/valgrind/gtest_exclude/ui_tests.gtest-tsan.txt
@@ -25,7 +25,6 @@ LocaleTestsHe.TestStart
LocaleTestsZhTw.TestStart
# These tests fail due to timeouts, see http://crbug.com/64619
-OptionsUITest.LoadOptionsByURL
OptionsUITest.CommandOpensOptionsTab
# Tests timing out, see http://crbug.com/92717
diff --git a/tools/valgrind/gtest_exclude/ui_tests.gtest.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest.txt
index b10f988..3360bd52 100644
--- a/tools/valgrind/gtest_exclude/ui_tests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/ui_tests.gtest.txt
@@ -122,3 +122,7 @@ BookmarksUITest.TwoCommandsOneTab
# OptionsUITest.NavBarCheck fails, see http://crbug.com/83209
OptionsUITest.NavBarCheck
+
+# These tests fail due to timeouts, see http://crbug.com/64619 and
+# http://crbug.com/51387
+OptionsUITest.LoadOptionsByURL
diff --git a/tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt
index 1315c08..51ca62f 100644
--- a/tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt
+++ b/tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt
@@ -82,7 +82,6 @@ ChromeMainTest.AppLaunch
SessionHistoryTest.LocationReplace
# UNIMPLEMENTED reached, see http://crbug.com/51387
-OptionsUITest.LoadOptionsByURL
AutomatedUITestBase.CloseTab
# See http://crbug.com/57717