diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-07-05 18:03:14 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-07-05 18:03:14 +0100 |
| commit | 339657d2d3faec98a122cff84adc9b3aaeff5aec (patch) | |
| tree | 4305f3582ac3a4dff6e1526ee0cd9230f42b06fc | |
| parent | 30236791e04a08c3a7edc49f00af4c63c4cb6a9d (diff) | |
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
4 files changed, 11 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c8b4ce4a629..38eb2c5fa06 100644 --- 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 fc28467e29b..4662fbd4b4d 100644 --- 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 c40651f13db..7740af51123 100644 --- 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 a166a9b1d58..20b8f59ba3d 100644 --- 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> >; |