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/strings/str_cat_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/str_cat_test.cc')
| -rw-r--r-- | absl/strings/str_cat_test.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/absl/strings/str_cat_test.cc b/absl/strings/str_cat_test.cc index c86a5952fab0..e9d676906382 100644 --- a/absl/strings/str_cat_test.cc +++ b/absl/strings/str_cat_test.cc @@ -22,6 +22,15 @@ #include "gtest/gtest.h" #include "absl/strings/substitute.h" +#ifdef __ANDROID__ +// Android assert messages only go to system log, so death tests cannot inspect +// the message for matching. +#define ABSL_EXPECT_DEBUG_DEATH(statement, regex) \ + EXPECT_DEBUG_DEATH(statement, ".*") +#else +#define ABSL_EXPECT_DEBUG_DEATH EXPECT_DEBUG_DEATH +#endif + namespace { // Test absl::StrCat of ints and longs of various sizes and signdedness. @@ -396,8 +405,9 @@ TEST(StrAppend, Death) { std::string s = "self"; // on linux it's "assertion", on mac it's "Assertion", // on chromiumos it's "Assertion ... failed". - EXPECT_DEBUG_DEATH(absl::StrAppend(&s, s.c_str() + 1), "ssertion.*failed"); - EXPECT_DEBUG_DEATH(absl::StrAppend(&s, s), "ssertion.*failed"); + ABSL_EXPECT_DEBUG_DEATH(absl::StrAppend(&s, s.c_str() + 1), + "ssertion.*failed"); + ABSL_EXPECT_DEBUG_DEATH(absl::StrAppend(&s, s), "ssertion.*failed"); } #endif // GTEST_HAS_DEATH_TEST |