diff options
| author |  Abseil Team <absl-team@google.com> | 2018-05-24 10:33:14 -0700 |
|---|---|---|
| committer |  katzdm <katzdm@google.com> | 2018-05-24 13:59:23 -0400 |
| commit | 99477fa9f1e89a7d8253c8aeee331864710d080c (patch) | |
| tree | 8c879314e11c9ff696b9a69c6411042c04b886f7 /absl/strings/string_view_test.cc | |
| 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/strings/string_view_test.cc')
| -rw-r--r-- | absl/strings/string_view_test.cc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/absl/strings/string_view_test.cc b/absl/strings/string_view_test.cc index bb149d5..fffa7b9 100644 --- a/absl/strings/string_view_test.cc +++ b/absl/strings/string_view_test.cc @@ -29,6 +29,15 @@ #include "absl/base/config.h" #include "absl/base/dynamic_annotations.h" +#ifdef __ANDROID__ +// Android assert messages only go to system log, so death tests cannot inspect +// the message for matching. +#define ABSL_EXPECT_DEATH_IF_SUPPORTED(statement, regex) \ + EXPECT_DEATH_IF_SUPPORTED(statement, ".*") +#else +#define ABSL_EXPECT_DEATH_IF_SUPPORTED EXPECT_DEATH_IF_SUPPORTED +#endif + namespace { // A minimal allocator that uses malloc(). @@ -1068,7 +1077,8 @@ TEST(HugeStringView, TwoPointTwoGB) { #if !defined(NDEBUG) && !defined(ABSL_HAVE_STD_STRING_VIEW) TEST(NonNegativeLenTest, NonNegativeLen) { - EXPECT_DEATH_IF_SUPPORTED(absl::string_view("xyz", -1), "len <= kMaxSize"); + ABSL_EXPECT_DEATH_IF_SUPPORTED(absl::string_view("xyz", -1), + "len <= kMaxSize"); } TEST(LenExceedsMaxSizeTest, LenExceedsMaxSize) { @@ -1078,8 +1088,8 @@ TEST(LenExceedsMaxSizeTest, LenExceedsMaxSize) { absl::string_view ok_view("", max_size); // Adding one to the max should trigger an assertion. - EXPECT_DEATH_IF_SUPPORTED(absl::string_view("", max_size + 1), - "len <= kMaxSize"); + ABSL_EXPECT_DEATH_IF_SUPPORTED(absl::string_view("", max_size + 1), + "len <= kMaxSize"); } #endif // !defined(NDEBUG) && !defined(ABSL_HAVE_STD_STRING_VIEW) |