diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 17:21:43 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 17:21:43 +0000 |
| commit | 20062551c2bf7f50fce15d9dba3fc91159fd785d (patch) | |
| tree | ea3ea272e7c3dc9efce4227abd569a316385d4c2 | |
| parent | f8c4c3996425c83f8c79eaa0f4f57745402a593f (diff) | |
| download | chromium_src-20062551c2bf7f50fce15d9dba3fc91159fd785d.zip chromium_src-20062551c2bf7f50fce15d9dba3fc91159fd785d.tar.gz chromium_src-20062551c2bf7f50fce15d9dba3fc91159fd785d.tar.bz2 | |
r21342 moved IPC tests from unit_tests to ipc_tests,
so tell chrome_tests.py to look in ipc rather than chrome
for its gtest.txt file, and actually move it.
(At least for valgrind. Purify may need the same change.)
Disable IPCChannelTest.ChannelTest and VisitedLinkEventsTest.Coalescense
on valgrind, as they hang there today on linux bots.
BUG=22141,22146
TEST=none
Review URL: http://codereview.chromium.org/165064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26453 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/data/valgrind/unit_tests.gtest.txt | 4 | ||||
| -rw-r--r-- | ipc/data/valgrind/ipc_tests.gtest.txt | 4 | ||||
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/chrome/test/data/valgrind/unit_tests.gtest.txt b/chrome/test/data/valgrind/unit_tests.gtest.txt index 3f75f25..30b697b 100644 --- a/chrome/test/data/valgrind/unit_tests.gtest.txt +++ b/chrome/test/data/valgrind/unit_tests.gtest.txt @@ -1,2 +1,2 @@ -# Takes 65 seconds to run. -IPCSyncChannelTest.ChattyServer +# Hangs sometimes; see http://crbugs.com/22146 +VisitedLinkEventsTest.Coalescense diff --git a/ipc/data/valgrind/ipc_tests.gtest.txt b/ipc/data/valgrind/ipc_tests.gtest.txt new file mode 100644 index 0000000..4a836ab --- /dev/null +++ b/ipc/data/valgrind/ipc_tests.gtest.txt @@ -0,0 +1,4 @@ +# Takes 27-40 seconds to run. +IPCSyncChannelTest.ChattyServer +# Hangs on Linux sometimes. See http://crbug.com/22141 +IPCChannelTest.ChannelTest diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index af0ad29..86d4280 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -241,7 +241,7 @@ class ChromeTests: return self.SimpleTest("chrome", "printing_unittests") def TestIpc(self): - return self.SimpleTest("chrome", "ipc_tests", + return self.SimpleTest("ipc", "ipc_tests", valgrind_test_args=["--trace_children"]) def TestNet(self): |