diff options
| author | Abseil Team <absl-team@google.com> | 2018-05-24T17·33-0700 |
|---|---|---|
| committer | katzdm <katzdm@google.com> | 2018-05-24T17·59-0400 |
| commit | 99477fa9f1e89a7d8253c8aeee331864710d080c (patch) | |
| tree | 8c879314e11c9ff696b9a69c6411042c04b886f7 /absl/base | |
| parent | 014f02a3eca93ef88163c3b408c86998ecf6572c (diff) | |
- 31d03284ca8017ba59d98d47e7d041f361d478a7 Release escaping microbenchmarks. by Alex Strelnikov <strel@google.com>
- f183ce453db49ebc1948bb1d8eced37021cf63f7 Internal change. by Derek Mauro <dmauro@google.com> - b1660cb93e0fa37cdcecf37642766f5bfd12c7b0 Improve compatibility of some cc_test targets for portabl... by Abseil Team <absl-team@google.com> GitOrigin-RevId: 31d03284ca8017ba59d98d47e7d041f361d478a7 Change-Id: I9c4c4d2ad12cfe10c914f7cfa9aaab67fcef5cb1
Diffstat (limited to 'absl/base')
| -rw-r--r-- | absl/base/BUILD.bazel | 10 | ||||
| -rw-r--r-- | absl/base/internal/exception_testing.h | 6 |
2 files changed, 15 insertions, 1 deletions
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) |