Adjust text of expected warnings changed in PR c++/86568.

libstdc++-v3/ChangeLog:

	* testsuite/21_strings/basic_string_view/cons/char/nonnull.cc: Adjust
	text of expected warning.
	* testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc: Same.
	* testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc: Same.
	* testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc: Same.
	* testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc: Same.

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc
index dc93cd67a1f0969434c44b4fc65d615d8e309f39..81c6fc5d29ab68424a6d35f978db4a92d031cbad 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc
@@ -23,7 +23,7 @@
 void
 test01()
 {
-  std::string_view s((const char*)nullptr); // { dg-warning "null arg" }
-  std::string_view t((char*)nullptr);      // { dg-warning "null arg" }
-  std::string_view u(nullptr);             // { dg-warning "null arg" }
+  std::string_view s((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+  std::string_view t((char*)nullptr);      // { dg-warning "\\\[-Wnonnull" }
+  std::string_view u(nullptr);             // { dg-warning "\\\[-Wnonnull" }
 }

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc
index ded89c2ce45846e6a2d7b144585cecd14f62b581..ce95884e5dee5ffb8975ad796afb708c66f8d35f 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc
@@ -23,7 +23,7 @@
 void
 test01()
 {
-  std::wstring_view s((const wchar_t*)nullptr);        // { dg-warning "null arg" }
-  std::wstring_view t((wchar_t*)nullptr);      // { dg-warning "null arg" }
-  std::wstring_view u(nullptr);                        // { dg-warning "null arg" }
+  std::wstring_view s((const wchar_t*)nullptr);        // { dg-warning "\\\[-Wnonnull" }
+  std::wstring_view t((wchar_t*)nullptr);      // { dg-warning "\\\[-Wnonnull" }
+  std::wstring_view u(nullptr);                        // { dg-warning "\\\[-Wnonnull" }
 }

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc
index 0deba716ed3f2b2a9d3371e097e117f05eb716b2..7060ffb01092db1c8c092f7aa93a81a91d0427cd 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc
@@ -24,6 +24,6 @@ int
 test01()
 {
   std::string_view s = "abcd";
-  return s.compare((const char*)nullptr);      // { dg-warning "null arg" }
-  return s.compare(0, 2, (const char*)nullptr);        // { dg-warning "null arg" }
+  return s.compare((const char*)nullptr);      // { dg-warning "\\\[-Wnonnull" }
+  return s.compare(0, 2, (const char*)nullptr);        // { dg-warning "\\\[-Wnonnull" }
 }

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc
index d097866b704d518360f81712112c1b09481843d8..97c7629d388fa5e886b9aac52d55d3a28f37ce7a 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc
@@ -24,10 +24,10 @@ int
 test01()
 {
   std::string_view s = "abcd";
-  return s.find((const char*)nullptr);         // { dg-warning "null arg" }
-  return s.find((const char*)nullptr, 1);      // { dg-warning "null arg" }
-  return s.find_first_of((const char*)nullptr);        // { dg-warning "null arg" }
-  return s.find_first_of((const char*)nullptr, 1); // { dg-warning "null arg" }
-  return s.find_first_not_of((const char*)nullptr); // { dg-warning "null arg" }
-  return s.find_first_not_of((const char*)nullptr, 1); // { dg-warning "null arg" }
+  return s.find((const char*)nullptr);         // { dg-warning "\\\[-Wnonnull" }
+  return s.find((const char*)nullptr, 1);      // { dg-warning "\\\[-Wnonnull" }
+  return s.find_first_of((const char*)nullptr);        // { dg-warning "\\\[-Wnonnull" }
+  return s.find_first_of((const char*)nullptr, 1); // { dg-warning "\\\[-Wnonnull" }
+  return s.find_first_not_of((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+  return s.find_first_not_of((const char*)nullptr, 1); // { dg-warning "\\\[-Wnonnull" }
 }

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc
index 55119b59a8f29c4f005e9e4ff1abba4e7b65e719..91525a54d1a3f09a708aa6af37f49afd570c70ba 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc
@@ -24,6 +24,6 @@ int
 test01()
 {
   std::string_view s = "abcd";
-  return s.rfind((const char*)nullptr);                // { dg-warning "null arg" }
-  return s.rfind((const char*)nullptr, 1);     // { dg-warning "null arg" }
+  return s.rfind((const char*)nullptr);                // { dg-warning "\\\[-Wnonnull" }
+  return s.rfind((const char*)nullptr, 1);     // { dg-warning "\\\[-Wnonnull" }
 }