From 99477fa9f1e89a7d8253c8aeee331864710d080c Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 24 May 2018 10:33:14 -0700 Subject: - 31d03284ca8017ba59d98d47e7d041f361d478a7 Release escaping microbenchmarks. by Alex Strelnikov - f183ce453db49ebc1948bb1d8eced37021cf63f7 Internal change. by Derek Mauro - b1660cb93e0fa37cdcecf37642766f5bfd12c7b0 Improve compatibility of some cc_test targets for portabl... by Abseil Team GitOrigin-RevId: 31d03284ca8017ba59d98d47e7d041f361d478a7 Change-Id: I9c4c4d2ad12cfe10c914f7cfa9aaab67fcef5cb1 --- absl/base/BUILD.bazel | 10 ++++++++++ absl/base/internal/exception_testing.h | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'absl/base') diff --git a/absl/base/BUILD.bazel b/absl/base/BUILD.bazel index 3d3c7aea57b6..748f2f9f2154 100644 --- a/absl/base/BUILD.bazel +++ b/absl/base/BUILD.bazel @@ -371,6 +371,11 @@ cc_test( size = "small", srcs = ["internal/sysinfo_test.cc"], copts = ABSL_TEST_COPTS, + tags = [ + "no_test_android_arm", + "no_test_android_arm64", + "no_test_android_x86", + ], deps = [ ":base", "//absl/synchronization", @@ -387,6 +392,11 @@ cc_test( "//absl:windows": [], "//conditions:default": ["-pthread"], }), + tags = [ + "no_test_android_arm", + "no_test_android_arm64", + "no_test_android_x86", + ], deps = [":malloc_internal"], ) diff --git a/absl/base/internal/exception_testing.h b/absl/base/internal/exception_testing.h index 07d7e8ee1ba6..fd89a3f6268f 100644 --- a/absl/base/internal/exception_testing.h +++ b/absl/base/internal/exception_testing.h @@ -28,8 +28,12 @@ #define ABSL_BASE_INTERNAL_EXPECT_FAIL(expr, exception_t, text) \ EXPECT_THROW(expr, exception_t) +#elif defined(__ANDROID__) +// Android asserts do not log anywhere that gtest can currently inspect. +// So we expect exit, but cannot match the message. +#define ABSL_BASE_INTERNAL_EXPECT_FAIL(expr, exception_t, text) \ + EXPECT_DEATH(expr, ".*") #else - #define ABSL_BASE_INTERNAL_EXPECT_FAIL(expr, exception_t, text) \ EXPECT_DEATH(expr, text) -- cgit 1.4.1