From f3f79afd30e16039c25ca820735a34d838ff13d6 Mon Sep 17 00:00:00 2001 From: mbjorge Date: Thu, 13 Oct 2016 17:13:04 -0700 Subject: [PATCH] [Chromecast] Disable net_unittests with sanitizers. Exclude all net_unittests test when run with sanitizers. The previous syntax didn't work because -= isn't supported for lists of scopes yet. This also has the advantage of net_unittests still getting built. TEST=local msan with with build script builder uses. BUG=None Review-Url: https://codereview.chromium.org/2420773002 Cr-Commit-Position: refs/heads/master@{#425213} --- chromecast/BUILD.gn | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn index 5833318c3d3227..47d963e1e367a9 100644 --- a/chromecast/BUILD.gn +++ b/chromecast/BUILD.gn @@ -197,7 +197,13 @@ cast_test_group("cast_tests") { net_unittests_filter = { test_name = "net_unittests" - if (target_os == "linux" && !is_cast_desktop_build) { + if (using_sanitizer) { + # TODO(mbjorge): net_unittests do not complete when run with sanitizers, + # (in particular, TSAN and UBSAN), resulting in build machines getting stuck + # for many hours. Disable them for now, since these are getting run on + # Chromium bots anyway. (internal b/31279943) + gtest_excludes = [ "*" ] + } else if (target_os == "linux" && !is_cast_desktop_build) { # Run net_unittests first to avoid random failures due to slow python startup # KeygenHandlerTest.SmokeTest and KeygenHandlerTest.ConcurrencyTest fail due to # readonly certdb (b/8153161) @@ -230,15 +236,6 @@ cast_test_group("cast_tests") { } } filters += [ net_unittests_filter ] - - # TODO(mbjorge): net_unittests do not complete when run with sanitizers, - # (in particular, TSAN and UBSAN), resulting in build machines getting stuck - # for many hours. Disable them for now, since these are getting run on - # Chromium bots anyway. (internal b/31279943) - if (using_sanitizer) { - tests -= [ "//net:net_unittests" ] - filters -= [ net_unittests_filter ] - } } # Creates the build and run lists for all test targets.