Add xfail-if to some tests that fail with COW strings

These tests fail when run with -D_GLIBCXX_USE_CXX11_ABI=0

	* testsuite/21_strings/basic_string/cons/char/deduction.cc: XFAIL for
	COW strings.
	* testsuite/21_strings/basic_string/cons/wchar_t/deduction.cc:
	Likewise.
	* testsuite/21_strings/basic_string/requirements/
	explicit_instantiation/debug.cc: Likewise.

From-SVN: r262448

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c8b4ce4a6298af63c50ce7274497636b14f19d81..38eb2c5fa06b3aa75d8458526a6262b152d0fc93 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2018-07-05  Jonathan Wakely  <jwakely@redhat.com>
 
+       * testsuite/21_strings/basic_string/cons/char/deduction.cc: XFAIL for
+       COW strings.
+       * testsuite/21_strings/basic_string/cons/wchar_t/deduction.cc:
+       Likewise.
+       * testsuite/21_strings/basic_string/requirements/
+       explicit_instantiation/debug.cc: Likewise.
+
        PR libstdc++/58265
        * include/bits/basic_string.h [!_GLIBCXX_USE_CXX11_ABI]
        (basic_string::assign(basic_string&&)): Add conditional noexcept

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/deduction.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/deduction.cc
index fc28467e29b271b5f76b042457897a8d2af14b01..4662fbd4b4d48a30de68cd7c4faf3ff4bbe62644 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/deduction.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/deduction.cc
@@ -17,6 +17,7 @@
 
 // { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
+// { dg-xfail-if "COW string missing deduction guides" { ! cxx11-abi } }
 
 #include <string>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/deduction.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/deduction.cc
index c40651f13dbd2c2e502c123856f35ae0fe20f7e0..7740af5112308c155a9f67ea3903813f1e847810 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/deduction.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/deduction.cc
@@ -17,6 +17,7 @@
 
 // { dg-options "-std=gnu++17" }
 // { dg-do compile { target c++17 } }
+// { dg-xfail-if "COW string missing deduction guides" { ! cxx11-abi } }
 
 #include <string>
 #include <testsuite_iterators.h>

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/debug.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/debug.cc
index a166a9b1d582a1f4a8f63adc6c60da02e817e9e1..20b8f59ba3d93803b6c80ea0f1281f3fd4a12605 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/debug.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/explicit_instantiation/debug.cc
@@ -20,8 +20,9 @@
 #include <debug/string>
 
 // { dg-do compile }
+// { dg-xfail-if "COW string missing some required members" { ! cxx11-abi } }
 
 // libstdc++/21770
 namespace debug = __gnu_debug;
-template class debug::basic_string<int, std::char_traits<int>, 
+template class debug::basic_string<int, std::char_traits<int>,
                                   std::allocator<char> >;