From 0a7cbf904d69d1d2a63efe0cb01a49bc5521d405 Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Sat, 9 Jul 2011 13:35:06 +0000 Subject: Add support for sql_unittests to chrome_tests.py. BUG=72317 TEST=chrome_tests.sh -t sql Review URL: http://codereview.chromium.org/7273087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91956 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/heapcheck/chrome_tests.py | 5 +++++ tools/valgrind/chrome_tests.py | 5 +++++ tools/valgrind/gtest_exclude/app_unittests.gtest-tsan.txt | 2 -- tools/valgrind/gtest_exclude/gfx_unittests.gtest-tsan.txt | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 tools/valgrind/gtest_exclude/app_unittests.gtest-tsan.txt create mode 100644 tools/valgrind/gtest_exclude/gfx_unittests.gtest-tsan.txt diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py index 46e7b89..7a63a3e 100755 --- a/tools/heapcheck/chrome_tests.py +++ b/tools/heapcheck/chrome_tests.py @@ -96,6 +96,8 @@ class ChromeTests(object): "test_shell": self.TestTestShell, "test_shell_tests": self.TestTestShell, "ui": self.TestUI, "ui_tests": self.TestUI, "unit": self.TestUnit, "unit_tests": self.TestUnit, + "sql": self.TestSql, "sql_unittests": self.TestSql, + # TODO(rsesek): Temporary, remove after buildbot master restart. "app": self.TestApp, "app_unittests": self.TestApp, "ui_unit": self.TestUIUnit, "ui_unittests": self.TestUIUnit, "gfx": self.TestGfx, "gfx_unittests": self.TestGfx, @@ -295,6 +297,9 @@ class ChromeTests(object): def TestUnit(self): return self.SimpleTest("chrome", "unit_tests") + def TestSql(self): + return self.SimpleTest("chrome", "sql_unittests") + def TestApp(self): return self.SimpleTest("chrome", "app_unittests") diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index 55ec970..1934770 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -253,6 +253,9 @@ class ChromeTests: def TestUnit(self): return self.SimpleTest("chrome", "unit_tests") + def TestSql(self): + return self.SimpleTest("chrome", "sql_unittests") + def TestApp(self): return self.SimpleTest("chrome", "app_unittests") @@ -434,6 +437,8 @@ class ChromeTests: "test_shell": TestTestShell, "test_shell_tests": TestTestShell, "ui": TestUI, "ui_tests": TestUI, "unit": TestUnit, "unit_tests": TestUnit, + "sql": TestSql, "sql_unittests": TestSql, + # TODO(rsesek): Temporary, remove after buildbot master restart. "app": TestApp, "app_unittests": TestApp, "ui_unit": TestUIUnit, "ui_unittests": TestUIUnit, "gfx": TestGfx, "gfx_unittests": TestGfx, diff --git a/tools/valgrind/gtest_exclude/app_unittests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/app_unittests.gtest-tsan.txt deleted file mode 100644 index 64383b7..0000000 --- a/tools/valgrind/gtest_exclude/app_unittests.gtest-tsan.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Hangs under TSAN, see http://crbug.com/28332 -TextEliderTest.ElideTextLongStrings diff --git a/tools/valgrind/gtest_exclude/gfx_unittests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/gfx_unittests.gtest-tsan.txt new file mode 100644 index 0000000..64383b7 --- /dev/null +++ b/tools/valgrind/gtest_exclude/gfx_unittests.gtest-tsan.txt @@ -0,0 +1,2 @@ +# Hangs under TSAN, see http://crbug.com/28332 +TextEliderTest.ElideTextLongStrings -- cgit v1.1