summaryrefslogtreecommitdiffstats
path: root/build/android
diff options
context:
space:
mode:
authoreugenis@chromium.org <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 07:06:44 +0000
committereugenis@chromium.org <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 07:06:44 +0000
commit502362c7a7aae513161cc7df2d0445ba0889de45 (patch)
tree6b8984e120f00772514491efe8636068ae46a2aa /build/android
parentb307466659bf4281954d5b2c2f53c50c027ea638 (diff)
downloadchromium_src-502362c7a7aae513161cc7df2d0445ba0889de45.zip
chromium_src-502362c7a7aae513161cc7df2d0445ba0889de45.tar.gz
chromium_src-502362c7a7aae513161cc7df2d0445ba0889de45.tar.bz2
Exclude two tests from ASan bots.
BUG=344868 R=yfriedman@chromium.org, bulach, yfriedman Review URL: https://codereview.chromium.org/179693002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
-rwxr-xr-xbuild/android/buildbot/bb_device_steps.py6
-rw-r--r--build/android/pylib/gtest/gtest_config.py7
2 files changed, 12 insertions, 1 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index d7cc590..d12b881 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -426,7 +426,11 @@ def GetDeviceSetupStepCmds():
def RunUnitTests(options):
- RunTestSuites(options, gtest_config.STABLE_TEST_SUITES)
+ suites = gtest_config.STABLE_TEST_SUITES
+ if options.asan:
+ suites = [s for s in suites
+ if s not in gtest_config.ASAN_EXCLUDED_TEST_SUITES]
+ RunTestSuites(options, suites)
def RunInstrumentationTests(options):
diff --git a/build/android/pylib/gtest/gtest_config.py b/build/android/pylib/gtest/gtest_config.py
index 21b9872..c1a32f1 100644
--- a/build/android/pylib/gtest/gtest_config.py
+++ b/build/android/pylib/gtest/gtest_config.py
@@ -34,6 +34,13 @@ STABLE_TEST_SUITES = [
'webkit_unit_tests',
]
+# Tests fail in component=shared_library build, which is required for ASan.
+# http://crbug.com/344868
+ASAN_EXCLUDED_TEST_SUITES = [
+ 'breakpad_unittests',
+ 'sandbox_linux_unittests'
+]
+
WEBRTC_CHROMIUM_TEST_SUITES = [
'content_browsertests',
]