diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 05:34:04 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 05:34:04 +0000 |
| commit | cbff694d3a9b3c35251fda985565204bc5e8e8d8 (patch) | |
| tree | 331332e7b7a7b06a0ff25386136fde1c1e47cc99 /tools | |
| parent | a38fb4ba1d91da6ec4e732bbda6ae92c3c8e3e11 (diff) | |
| download | chromium_src-cbff694d3a9b3c35251fda985565204bc5e8e8d8.zip chromium_src-cbff694d3a9b3c35251fda985565204bc5e8e8d8.tar.gz chromium_src-cbff694d3a9b3c35251fda985565204bc5e8e8d8.tar.bz2 | |
Disable unit_tests for memcheck/Mac by checking in chrome_tests.py
Undo attempt to disable from unit_tests.gtest_mac.txt as it didn't solve the problem.
BUG=51716
TEST=Chromium Mac (Valgrind)(1) bot
Review URL: https://chromiumcodereview.appspot.com/9316020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 8 | ||||
| -rw-r--r-- | tools/valgrind/gtest_exclude/unit_tests.gtest_mac.txt | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index ae3696b..9552e82 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -281,6 +281,12 @@ class ChromeTests: return self.SimpleTest("webkit", "test_shell_tests") def TestUnit(self): + # http://crbug.com/51716 + # Disabling all unit tests + # Problems reappeared after r119922 + if common.IsMac() and (self._options.valgrind_tool == "memcheck"): + logging.warning("unit_tests are disabled for memcheck on MacOS.") + return 0; return self.SimpleTest("chrome", "unit_tests") def TestUIUnit(self): diff --git a/tools/valgrind/gtest_exclude/unit_tests.gtest_mac.txt b/tools/valgrind/gtest_exclude/unit_tests.gtest_mac.txt index 9e029cd..589b694 100644 --- a/tools/valgrind/gtest_exclude/unit_tests.gtest_mac.txt +++ b/tools/valgrind/gtest_exclude/unit_tests.gtest_mac.txt @@ -1,9 +1,3 @@ -# crbug 51716 -# Disabling all unit tests -# Problems reappeared after r119922 -* -*.* - # Times out too often # crbug.com/15817 IPCSyncChannelTest.* |