diff options
author | Abseil Team <absl-team@google.com> | 2017-12-01 12:15:49 -0800 |
---|---|---|
committer | Xiaoyi Zhang <zhangxy988@gmail.com> | 2017-12-01 15:25:15 -0500 |
commit | 8b727aa7aba86ce396da8e4886e40ea3e4357e27 (patch) | |
tree | a5d22e038a49860ace2c09238c4cca6574198b10 /absl/strings/str_split_test.cc | |
parent | 579f2879acb6ad6e2935cc970399a1e52c1ee9eb (diff) |
Changes imported from Abseil "staging" branch:
- 5d8235b05f4ea2b33a138712f463a30b6ae75719 Incorporate PR https://github.com/abseil/abseil-cpp/pull/... by Xiaoyi Zhang <zhangxy@google.com>
- f2bc653acdaa983aa2765693476c17cd1142d59b Run the StrSplit WorksWithLargeStrings test in all configs. by Matt Armstrong <marmstrong@google.com>
- 43aed1ea7dffcd656e1916c2d5637650fc3a8de3 Incorporate PR https://github.com/abseil/abseil-cpp/pull/... by Xiaoyi Zhang <zhangxy@google.com>
- d58511d60904c7090e44638339ba63b97ca96f1a Add a new simple Mutex lifetime test, to be extended later. by Greg Falcon <gfalcon@google.com>
- db5c86c186c09ad57963bcbd2b6182f62bce8ed0 Actually use the exception in TestCheckerAtCountdown by Jon Cohen <cohenjon@google.com>
- 29c01a72b62d9a4b90f9bd935e3575adbafd85ed Use factories instead of explicitly passing pointers to T... by Jon Cohen <cohenjon@google.com>
- 54d5526ee6ab7784992845f6e6e2c7d48ba008a5 Fix uint128 ostream operator and improve ostream test. by Alex Strelnikov <strel@google.com>
- 4e49abe7e569cf6bd0eae95ce2b2fe2faa051fa2 Fix documentation: strings::PairFormatter -> absl::PairFo... by Derek Mauro <dmauro@google.com>
- 4044297f0e1a8a6c6ae3f781a65080e0d57c6751 Cut the memory used by the StrSplit WorksWithLargeStrings... by Jorg Brown <jorg@google.com>
GitOrigin-RevId: 5d8235b05f4ea2b33a138712f463a30b6ae75719
Change-Id: Ib6b6b0161c26e5326b53a126454754e33678eefc
Diffstat (limited to 'absl/strings/str_split_test.cc')
-rw-r--r-- | absl/strings/str_split_test.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/absl/strings/str_split_test.cc b/absl/strings/str_split_test.cc index 22a68d0f..9c79d7dc 100644 --- a/absl/strings/str_split_test.cc +++ b/absl/strings/str_split_test.cc @@ -857,12 +857,10 @@ TEST(Delimiter, ByLength) { EXPECT_FALSE(IsFoundAt("abcd", four_char_delim, 0)); } -// Allocates too much memory for TSan and MSan. -#if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) TEST(Split, WorksWithLargeStrings) { - if (sizeof(size_t) > 4 && !RunningOnValgrind()) { - std::string s(1ULL << 31, 'x'); - s.push_back('-'); // 2G + 1 byte + if (sizeof(size_t) > 4) { + std::string s((uint32_t{1} << 31) + 1, 'x'); // 2G + 1 byte + s.back() = '-'; std::vector<absl::string_view> v = absl::StrSplit(s, '-'); EXPECT_EQ(2, v.size()); // The first element will contain 2G of 'x's. @@ -873,7 +871,6 @@ TEST(Split, WorksWithLargeStrings) { EXPECT_EQ("", v[1]); } } -#endif // THREAD_SANITIZER TEST(SplitInternalTest, TypeTraits) { EXPECT_FALSE(absl::strings_internal::HasMappedType<int>::value); |