Changes imported from Abseil "staging" branch:

  - d5a5960a133967e4af02836d304884cd6cbd6e46 Adjusting time tests for flakiness by Gennadiy Civil <misterg@google.com>
  - ccb8535fdc92c3c99bfa2795e75d3fbdcb134571 Internal-only tweak. by Jorg Brown <jorg@google.com>
  - 4c03dd9e54bd4645e7e7a8dfb3c590f5b0654884 Fix comment on some C++11 type traits backport. by Xiaoyi Zhang <zhangxy@google.com>
  - 43cd12d2304464163e33ae932fbb842a869213dd Allow intrinsic int128 to be set for __ppc64__ targets. by Abseil Team <absl-team@google.com>
  - 789e9c13de67ef3c7ba09c765c3484621897b6bb Update README.md description of 'types' library to be con... by Abseil Team <absl-team@google.com>
  - 8be10d7683c90b85244ddc67360a7ca2dfffdf01 Update comment on move constructors' noexcept specificati... by Xiaoyi Zhang <zhangxy@google.com>

GitOrigin-RevId: d5a5960a133967e4af02836d304884cd6cbd6e46
Change-Id: I743efee47b9e65f46a44d9ab80ccd62cfd0c1301

1 files changed, 10 insertions, 4 deletions

diff --git a/absl/strings/str_cat_test.cc b/absl/strings/str_cat_test.cc
index 293d194..dd063b0 100644
--- a/absl/strings/str_cat_test.cc
+++ b/absl/strings/str_cat_test.cc
@@ -300,6 +300,12 @@ TEST(StrAppend, Basics) {
     "World"
   };
 
+  std::string stdstrs[] = {
+    "std::Hello",
+    "std::Cruel",
+    "std::World"
+  };
+
   absl::string_view pieces[] = {"Hello", "Cruel", "World"};
 
   const char* c_strs[] = {
@@ -324,12 +330,12 @@ TEST(StrAppend, Basics) {
   EXPECT_EQ(result.substr(old_size), "CruelWorld");
 
   old_size = result.size();
-  absl::StrAppend(&result, strs[0], ", ", pieces[2]);
-  EXPECT_EQ(result.substr(old_size), "Hello, World");
+  absl::StrAppend(&result, stdstrs[0], ", ", pieces[2]);
+  EXPECT_EQ(result.substr(old_size), "std::Hello, World");
 
   old_size = result.size();
-  absl::StrAppend(&result, strs[0], ", ", strs[1], " ", strs[2], "!");
-  EXPECT_EQ(result.substr(old_size), "Hello, Cruel World!");
+  absl::StrAppend(&result, strs[0], ", ", stdstrs[1], " ", strs[2], "!");
+  EXPECT_EQ(result.substr(old_size), "Hello, std::Cruel World!");
 
   old_size = result.size();
   absl::StrAppend(&result, pieces[0], ", ", pieces[1], " ", pieces[2]);