1 files changed, 18 insertions, 31 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
index 294645f76608..526fed83daca 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
@@ -26,38 +26,26 @@ test(S s, const typename S::value_type* str, S expected)
     assert(s == expected);
 }
 
-TEST_CONSTEXPR_CXX20 bool test() {
-  {
-    typedef std::string S;
-    test(S(), "", S());
-    test(S(), "12345", S("12345"));
-    test(S(), "12345678901234567890", S("12345678901234567890"));
-
-    test(S("12345"), "", S("12345"));
-    test(S("12345"), "12345", S("1234512345"));
-    test(S("12345"), "1234567890", S("123451234567890"));
+template <class S>
+TEST_CONSTEXPR_CXX20 void test_string() {
+  test(S(), "", S());
+  test(S(), "12345", S("12345"));
+  test(S(), "12345678901234567890", S("12345678901234567890"));
+
+  test(S("12345"), "", S("12345"));
+  test(S("12345"), "12345", S("1234512345"));
+  test(S("12345"), "1234567890", S("123451234567890"));
+
+  test(S("12345678901234567890"), "", S("12345678901234567890"));
+  test(S("12345678901234567890"), "12345", S("1234567890123456789012345"));
+  test(S("12345678901234567890"), "12345678901234567890",
+        S("1234567890123456789012345678901234567890"));
+}
 
-    test(S("12345678901234567890"), "", S("12345678901234567890"));
-    test(S("12345678901234567890"), "12345", S("1234567890123456789012345"));
-    test(S("12345678901234567890"), "12345678901234567890",
-         S("1234567890123456789012345678901234567890"));
-  }
+TEST_CONSTEXPR_CXX20 bool test() {
+  test_string<std::string>();
 #if TEST_STD_VER >= 11
-  {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    test(S(), "", S());
-    test(S(), "12345", S("12345"));
-    test(S(), "12345678901234567890", S("12345678901234567890"));
-
-    test(S("12345"), "", S("12345"));
-    test(S("12345"), "12345", S("1234512345"));
-    test(S("12345"), "1234567890", S("123451234567890"));
-
-    test(S("12345678901234567890"), "", S("12345678901234567890"));
-    test(S("12345678901234567890"), "12345", S("1234567890123456789012345"));
-    test(S("12345678901234567890"), "12345678901234567890",
-         S("1234567890123456789012345678901234567890"));
-  }
+  test_string<std::basic_string<char, std::char_traits<char>, min_allocator<char>>>();
 #endif
 
   { // test appending to self
@@ -75,7 +63,6 @@ TEST_CONSTEXPR_CXX20 bool test() {
     s_long.append(s_long.c_str());
     assert(s_long == "Lorem ipsum dolor sit amet, consectetur/Lorem ipsum dolor sit amet, consectetur/");
   }
-
   return true;
 }