summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 09:44:16 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 09:44:16 +0000
commit57ca0af7d292e5af44f02ffa1472d98cb359bd05 (patch)
tree631824ba3af469773fb00a4a48339953917881db /tools
parent6e37fe3bace029fe08929c71cb82a94b7f4f06c2 (diff)
downloadchromium_src-57ca0af7d292e5af44f02ffa1472d98cb359bd05.zip
chromium_src-57ca0af7d292e5af44f02ffa1472d98cb359bd05.tar.gz
chromium_src-57ca0af7d292e5af44f02ffa1472d98cb359bd05.tar.bz2
Exclude a couple of sync tests from running under TSan.
Also, print human-readable paths for gtest filter files. BUG=74663 TBR=glider Review URL: http://codereview.chromium.org/6597102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/valgrind/chrome_tests.py6
-rw-r--r--tools/valgrind/gtest_exclude/sync_unit_tests.gtest-tsan.txt3
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 2588a39..6544151 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -154,11 +154,13 @@ class ChromeTests:
os.path.join(gtest_files_dir, name + ".gtest_%s.txt" % platform_suffix),
os.path.join(gtest_files_dir, name + ".gtest-%s_%s.txt" % \
(tool.ToolName(), platform_suffix))]
+ logging.info("Reading gtest exclude filter files:")
for filename in gtest_filter_files:
+ readable_filename = filename.replace(self._source_dir + "/", "")
if not os.path.exists(filename):
- logging.info("gtest filter file %s not found - skipping" % filename)
+ logging.info(" \"%s\" - not found" % readable_filename)
continue
- logging.info("Reading gtest filters from %s" % filename)
+ logging.info(" \"%s\" - OK" % readable_filename)
f = open(filename, 'r')
for line in f.readlines():
if line.startswith("#") or line.startswith("//") or line.isspace():
diff --git a/tools/valgrind/gtest_exclude/sync_unit_tests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/sync_unit_tests.gtest-tsan.txt
index e69de29..4d40705 100644
--- a/tools/valgrind/gtest_exclude/sync_unit_tests.gtest-tsan.txt
+++ b/tools/valgrind/gtest_exclude/sync_unit_tests.gtest-tsan.txt
@@ -0,0 +1,3 @@
+# Fail under RaceVerifier, see http://crbug.com/74663
+SyncerThread2Test.NudgeCoalescing
+SyncerThread2Test.NudgeWithPayloadsCoalescing