* [libstdc++-v3] Fix dg-require before dg-run directives in testsuite.
@ 2016-09-02 13:18 Matthew Wahab
2016-09-06 10:16 ` Jonathan Wakely
0 siblings, 1 reply; 5+ messages in thread
From: Matthew Wahab @ 2016-09-02 13:18 UTC (permalink / raw)
To: gcc-patches, libstdc++
[-- Attachment #1: Type: text/plain, Size: 15852 bytes --]
Hello,
Tests in the libstdc++-v3 testsuite were recently changed to use { dg-do
.. { target c++11 } } instead of using a dg-options to set -std
(https://gcc.gnu.org/ml/libstdc++/2016-08/msg00102.html). As a
consequence, several tests were left with directive lists that had
dg-require preceding dg-do. This meant that some tests were run when
they should have been skipped as unsupported. In particular, most of the
23_algorithms/*/complexity.cc tests became FAIL on aarch64-none-elf
This patch adjusts the tests so that the dg-requires come after the
dg-do directives. The makes the tests that were previously
FAIL/UNRESOLVED become UNSUPPORTED. It also makes UNSUPPORTED some tests
that were PASS.
The tests that move from FAIL/UNRESOLVED to UNSUPPORTED:
- 22_locale/locale/cons/unicode.cc.
- 25_algorithms/{pop_heap,push_heap,sort_heap}/complexity.c.
From PASS to UNSUPPORTED:
- 23_containers/*/debug/60499.c
- 23_containers/vector/debug/52433.c
Tested by running the testsuite for cross-compiled aarch64-none-elf.
Ok for trunk?
Matthew
2016-09-02 Matthew Wahab <matthew.wahab@arm.com>
* testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc: Move dg-do
directive before dg-require.
* testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc: Likewise.
* testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc: Likewise.
* testsuite/22_locale/codecvt/utf8.cc: Likewise.
* testsuite/22_locale/locale/cons/unicode.cc: Likewise.
* testsuite/23_containers/deque/debug/assign1_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/assign2_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/assign3_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/insert5_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/deque/debug/self_move_assign_neg.cc: Likewise.
* testsuite/23_containers/deque/debug/shrink_to_fit.cc: Likewise.
* testsuite/23_containers/forward_list/debug/60499.cc: Likewise.
* testsuite/23_containers/forward_list/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/erase_after1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/erase_after2_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/erase_after3_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/erase_after4_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/erase_after5_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/erase_after6_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/erase_after7_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/erase_after8_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/erase_after9_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/insert_after1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/insert_after2_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/insert_after3_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/insert_after4_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/splice_after1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/splice_after2_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/splice_after3_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/splice_after4_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/splice_after5_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/splice_after6_neg.cc: Likewise.
* testsuite/23_containers/forward_list/debug/splice_after7_neg.cc: Likewise.
* testsuite/23_containers/list/debug/assign1_neg.cc: Likewise.
* testsuite/23_containers/list/debug/assign2_neg.cc: Likewise.
* testsuite/23_containers/list/debug/assign3_neg.cc: Likewise.
* testsuite/23_containers/list/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/list/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/list/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/list/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/list/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/list/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/list/debug/insert5_neg.cc: Likewise.
* testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/list/debug/self_move_assign_neg.cc: Likewise.
* testsuite/23_containers/map/debug/60499.cc: Likewise.
* testsuite/23_containers/map/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/map/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/map/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/map/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/map/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/map/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/map/debug/self_move_assign_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/60499.cc: Likewise.
* testsuite/23_containers/multimap/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/multimap/debug/self_move_assign_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/60499.cc: Likewise.
* testsuite/23_containers/multiset/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/multiset/debug/self_move_assign_neg.cc: Likewise.
* testsuite/23_containers/set/debug/60499.cc: Likewise.
* testsuite/23_containers/set/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/set/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/set/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/set/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/set/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/set/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/set/debug/self_move_assign_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/60499.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/begin1_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/begin2_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/cbegin_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/cend_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/end1_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/end2_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/insert3_neg.cc: Likewise.
*
testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc:
Likewise.
*
testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc: Likewise.
* testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc:
Likewise.
* testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc:
Likewise.
* testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc:
Likewise.
* testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/60499.cc: Likewise.
* testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc: Likewise.
* testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc: Likewise.
* testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc: Likewise.
* testsuite/23_containers/unordered_multimap/debug/cend_neg.cc: Likewise.
* testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/end1_neg.cc: Likewise.
* testsuite/23_containers/unordered_multimap/debug/end2_neg.cc: Likewise.
* testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc: Likewise.
*
testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc:
Likewise.
*
testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc:
Likewise.
*
testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc:
Likewise.
*
testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc:
Likewise.
*
testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/60499.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/cend_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/end1_neg.cc: Likewise.
* testsuite/23_containers/unordered_multiset/debug/end2_neg.cc: Likewise.
* testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc: Likewise.
*
testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc:
Likewise.
*
testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc:
Likewise.
*
testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc:
Likewise.
*
testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc:
Likewise.
*
testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/60499.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/begin1_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/begin2_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/cbegin_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/cend_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/end1_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/end2_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/unordered_set/debug/insert3_neg.cc: Likewise.
*
testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc:
Likewise.
* testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc:
Likewise.
* testsuite/23_containers/vector/debug/52433.cc: Likewise.
* testsuite/23_containers/vector/debug/60499.cc: Likewise.
* testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc: Likewise.
* testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc:
Likewise.
* testsuite/23_containers/vector/debug/self_move_assign_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/shrink_to_fit.cc: Likewise.
* testsuite/25_algorithms/pop_heap/complexity.cc: Likewise.
* testsuite/25_algorithms/push_heap/complexity.cc: Likewise.
* testsuite/25_algorithms/sort_heap/complexity.cc: Likewise.
* testsuite/29_atomics/atomic/60658.cc: Likewise.
* testsuite/29_atomics/atomic/60695.cc: Likewise.
* testsuite/29_atomics/atomic/62259.cc: Likewise.
* testsuite/29_atomics/atomic/64658.cc: Likewise.
* testsuite/29_atomics/atomic/cons/49445.cc: Likewise.
* testsuite/29_atomics/atomic/operators/51811.cc: Likewise.
* testsuite/29_atomics/atomic/operators/pointer_partial_void.cc: Likewise.
[-- Attachment #2: 0001-libstdc-v3-Fix-dg-require-before-dg-run-directives-i.patch --]
[-- Type: text/x-patch, Size: 135360 bytes --]
From 245a2d7d85204047ae7067207d05a333a65067e3 Mon Sep 17 00:00:00 2001
From: Matthew Wahab <matthew.wahab@arm.com>
Date: Thu, 1 Sep 2016 16:38:45 +0100
Subject: [PATCH] [libstdc++-v3] Fix dg-require before dg-run directives in
testsuite.
---
.../testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc | 2 +-
.../testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc | 2 +-
.../testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc | 2 +-
libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc | 2 +-
libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/insert5_neg.cc | 2 +-
.../23_containers/deque/debug/iterator_self_move_assign_neg.cc | 2 +-
.../testsuite/23_containers/deque/debug/self_move_assign_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/deque/debug/shrink_to_fit.cc | 2 +-
libstdc++-v3/testsuite/23_containers/forward_list/debug/60499.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/construct1_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/construct2_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/construct3_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/erase_after1_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/erase_after2_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/erase_after3_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/erase_after4_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/erase_after5_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/erase_after6_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/erase_after7_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/erase_after8_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/erase_after9_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/insert_after1_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/insert_after2_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/insert_after3_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/insert_after4_neg.cc | 2 +-
.../23_containers/forward_list/debug/iterator_self_move_assign_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/splice_after1_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/splice_after2_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/splice_after3_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/splice_after4_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/splice_after5_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/splice_after6_neg.cc | 2 +-
.../testsuite/23_containers/forward_list/debug/splice_after7_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/list/debug/insert5_neg.cc | 2 +-
.../23_containers/list/debug/iterator_self_move_assign_neg.cc | 2 +-
.../testsuite/23_containers/list/debug/self_move_assign_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/map/debug/60499.cc | 2 +-
libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc | 2 +-
.../testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/map/debug/self_move_assign_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multimap/debug/60499.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc | 2 +-
.../23_containers/multimap/debug/iterator_self_move_assign_neg.cc | 2 +-
.../testsuite/23_containers/multimap/debug/self_move_assign_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multiset/debug/60499.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc | 2 +-
.../23_containers/multiset/debug/iterator_self_move_assign_neg.cc | 2 +-
.../testsuite/23_containers/multiset/debug/self_move_assign_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/set/debug/60499.cc | 2 +-
libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc | 2 +-
.../testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/set/debug/self_move_assign_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_map/debug/60499.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_map/debug/cbegin_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_map/debug/cend_neg.cc | 2 +-
.../testsuite/23_containers/unordered_map/debug/construct1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_map/debug/construct2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_map/debug/construct3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_map/debug/end1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_map/debug/end2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_map/debug/insert1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_map/debug/insert2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_map/debug/insert3_neg.cc | 2 +-
.../unordered_map/debug/invalid_local_iterator_compare_neg.cc | 2 +-
.../unordered_map/debug/invalid_local_iterator_range_neg.cc | 2 +-
.../23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc | 2 +-
.../testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc | 2 +-
.../23_containers/unordered_map/debug/self_move_assign_neg.cc | 2 +-
.../23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc | 2 +-
.../23_containers/unordered_map/debug/use_invalid_iterator_neg.cc | 2 +-
.../unordered_map/debug/use_invalid_local_iterator_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/60499.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc | 2 +-
.../23_containers/unordered_multimap/debug/bucket_size_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/cend_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/end1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/end2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc | 2 +-
.../unordered_multimap/debug/invalid_local_iterator_compare_neg.cc | 2 +-
.../unordered_multimap/debug/invalid_local_iterator_range_neg.cc | 2 +-
.../unordered_multimap/debug/iterator_self_move_assign_neg.cc | 2 +-
.../23_containers/unordered_multimap/debug/max_load_factor_neg.cc | 2 +-
.../23_containers/unordered_multimap/debug/self_move_assign_neg.cc | 2 +-
.../unordered_multimap/debug/use_erased_local_iterator_neg.cc | 2 +-
.../23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc | 2 +-
.../unordered_multimap/debug/use_invalid_local_iterator_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/60499.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc | 2 +-
.../23_containers/unordered_multiset/debug/bucket_size_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc | 3 ++-
.../testsuite/23_containers/unordered_multiset/debug/cend_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/end1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/end2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc | 2 +-
.../unordered_multiset/debug/invalid_local_iterator_compare_neg.cc | 2 +-
.../unordered_multiset/debug/invalid_local_iterator_range_neg.cc | 2 +-
.../unordered_multiset/debug/iterator_self_move_assign_neg.cc | 2 +-
.../23_containers/unordered_multiset/debug/max_load_factor_neg.cc | 2 +-
.../23_containers/unordered_multiset/debug/self_move_assign_neg.cc | 2 +-
.../unordered_multiset/debug/use_erased_local_iterator_neg.cc | 2 +-
.../23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc | 2 +-
.../unordered_multiset/debug/use_invalid_local_iterator_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_set/debug/60499.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_set/debug/cbegin_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_set/debug/cend_neg.cc | 2 +-
.../testsuite/23_containers/unordered_set/debug/construct1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_set/debug/construct2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_set/debug/construct3_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_set/debug/end1_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/unordered_set/debug/end2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_set/debug/insert1_neg.cc | 2 +-
.../testsuite/23_containers/unordered_set/debug/insert2_neg.cc | 2 +-
.../testsuite/23_containers/unordered_set/debug/insert3_neg.cc | 2 +-
.../unordered_set/debug/invalid_local_iterator_compare_neg.cc | 2 +-
.../unordered_set/debug/invalid_local_iterator_range_neg.cc | 2 +-
.../23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc | 2 +-
.../testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc | 2 +-
.../23_containers/unordered_set/debug/self_move_assign_neg.cc | 2 +-
.../23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc | 2 +-
.../23_containers/unordered_set/debug/use_invalid_iterator_neg.cc | 2 +-
.../unordered_set/debug/use_invalid_local_iterator_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc | 2 +-
libstdc++-v3/testsuite/23_containers/vector/debug/60499.cc | 2 +-
.../testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc | 2 +-
.../23_containers/vector/debug/iterator_self_move_assign_neg.cc | 2 +-
.../testsuite/23_containers/vector/debug/self_move_assign_neg.cc | 2 +-
libstdc++-v3/testsuite/23_containers/vector/debug/shrink_to_fit.cc | 2 +-
libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc | 2 +-
libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc | 2 +-
libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc | 2 +-
libstdc++-v3/testsuite/29_atomics/atomic/60658.cc | 2 +-
libstdc++-v3/testsuite/29_atomics/atomic/60695.cc | 2 +-
libstdc++-v3/testsuite/29_atomics/atomic/62259.cc | 2 +-
libstdc++-v3/testsuite/29_atomics/atomic/64658.cc | 2 +-
libstdc++-v3/testsuite/29_atomics/atomic/cons/49445.cc | 2 +-
libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc | 2 +-
.../testsuite/29_atomics/atomic/operators/pointer_partial_void.cc | 2 +-
196 files changed, 197 insertions(+), 196 deletions(-)
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc
index a000095..78ddb5c 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/requirements/1.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-require-cstdint "" }
// { dg-do compile { target c++11 } }
+// { dg-require-cstdint "" }
#include <codecvt>
#include <type_traits>
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc
index 12ac516..a9c50ef 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/requirements/1.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-require-cstdint "" }
// { dg-do compile { target c++11 } }
+// { dg-require-cstdint "" }
#include <codecvt>
#include <type_traits>
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc
index 4ebb6a4..0d56978 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/requirements/1.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-require-cstdint "" }
// { dg-do compile { target c++11 } }
+// { dg-require-cstdint "" }
#include <codecvt>
#include <type_traits>
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc b/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc
index a20feb5..86fdf0d 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/utf8.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-require-cstdint "" }
// { dg-do run { target c++11 } }
+// { dg-require-cstdint "" }
#include <locale>
#include <iterator>
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
index 76f730a..906ddf1 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
@@ -1,5 +1,5 @@
-// { dg-require-iconv "ISO-8859-1" }
// { dg-do run { target c++11 } }
+// { dg-require-iconv "ISO-8859-1" }
// Copyright (C) 2006-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc
index c866464..dc3442d 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc
index 92fc1e7..5deed88 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc
index a52eb41..761e8e9 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc
index 2443b0d..637882f 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc
index c73adb7..46b0ee1 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc
index 297d9b3..7b52b3d 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc
index 5636fd4..2b28689 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc
index 956f696..7e2696e 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc
index 9ad8493..1c03816 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert5_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert5_neg.cc
index 7fdf443..a74d292 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert5_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc
index 28e2e64..64bc35a 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/self_move_assign_neg.cc
index b378cd2..576c726 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/shrink_to_fit.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/shrink_to_fit.cc
index 51e0cb1..71819bb 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/shrink_to_fit.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <deque>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/60499.cc
index ed5cace..d127fb0 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/60499.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60499
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct1_neg.cc
index cd0864f..9a97094 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <forward_list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct2_neg.cc
index a9d4bda..7a47cd2 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <forward_list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct3_neg.cc
index b622044..63b4891 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <forward_list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc
index 59e03be..ae90415 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc
index a5a2743..6234de0 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc
index dc14635..813fbed 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc
index 156db15..3ef3233 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc
index 68f7fe8..376ac37 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc
index 5fd1496..ec0186d 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc
index ecf60ff..b7f0323 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc
index 3cfa7dc..81fe142 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc
index ee7db91..11fbca0 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc
index ae2f399..1e9f245 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc
index f1fce3b..d2ea77d 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc
index 35706b8..ca94bfe 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after4_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after4_neg.cc
index 2898090..7849531 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after4_neg.cc
@@ -15,9 +15,9 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
+// { dg-do run { target c++11 xfail *-*-* } }
// { dg-require-debug-mode "" }
// { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" }
-// { dg-do run { target c++11 xfail *-*-* } }
#include <forward_list>
#include <iterator>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc
index bc197a5..37f3957 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <forward_list>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc
index e50d37f..505d654 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <forward_list>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc
index 5f74f9c..0222e14 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc
index 1416d61..87a4671 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc
index 96b8290..0735789 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc
index cfcc1b2..1588898 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2010-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after5_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after5_neg.cc
index 5bcf38d..14217b2 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after5_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2012-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after6_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after6_neg.cc
index bf49d43..ca5a356 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after6_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after6_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2012-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after7_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after7_neg.cc
index 6e8b067..d7c670c 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after7_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after7_neg.cc
@@ -1,5 +1,5 @@
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
// Copyright (C) 2012-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc
index cde326f..1eee86f 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc
index 19fbbde..41eb33e 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc
index cc9d9ee..e0a4fc1 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc
index ee4c237..fa60f5f 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc
index 650cee4..a56ebcb 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc
index 1e5408c..bffb701b 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc
index 57ce024..54bd5cb 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc
index 58628a4..4428aae 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc
index f62bd3c..0d93f5a 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert5_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert5_neg.cc
index 21f2781..cec84d0 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert5_neg.cc
@@ -15,9 +15,9 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
+// { dg-do run { xfail *-*-* } }
// { dg-require-debug-mode "" }
// { dg-options "-D_GLIBCXX_DEBUG_PEDANTIC" }
-// { dg-do run { xfail *-*-* } }
#include <list>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc
index 8b0639b..31f4f37 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/self_move_assign_neg.cc
index 7ab40ba..833e957 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <list>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/map/debug/60499.cc
index ad4fb44..ef12b34 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/60499.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60499
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc
index b584060..e2589e8 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc
index e55c666..f948438 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc
index 2f7d8eb..6732d18 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc
index f8ef1d2..351d937 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc
index 582ef2e..46e1e07 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc
index 39fda63..58549e6 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc
index cc3e0e6..fa30d1b 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/self_move_assign_neg.cc
index 4eb690d..8223345 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/60499.cc
index bda4b5c..a226e39 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/60499.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60499
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc
index 2f37742..d73daa9 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc
index 9643e7f..89b9432 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc
index 747cae4..9988460 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc
index 2fdb838..e0dc28d 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc
index ed0509c..edecbad 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc
index 3ccd5e2..1c860b4 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc
index 8062a98..6160a57 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/self_move_assign_neg.cc
index 4f3c5f3..301c884 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <map>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/60499.cc
index b543590..9b0f95d 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/60499.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60499
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc
index dcc5c84..bf167e2 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc
index 2592f1e..87ed3ae 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc
index 025df91..7430240 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc
index df2f9c5..275703e 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc
index 7731c4b..ee92d38 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc
index 7c3ff36..3182dfc 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc
index 92ea5df..3f3cacd 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/self_move_assign_neg.cc
index 4c5ed56..e6b6fbc 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/set/debug/60499.cc
index de7cfb6..01dae77 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/60499.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60499
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc
index b10afb9..0c6504d 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc
index dffab01..366d9bd 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc
index e8b2b5c..3038ebb 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc
index 35819e5..81eaaf5 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc
index 2186b62..699e556 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc
index 26ba953..6df317d 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc
index 4ce33c7..171cbc7 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/self_move_assign_neg.cc
index 5d64430..b2f022c 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/60499.cc
index e77cc00..6b00c81 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/60499.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60499
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin1_neg.cc
index 3529123..ca9e7d2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin2_neg.cc
index 3d3a882..26880d0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/begin2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc
index efe3f41..a8d856f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/bucket_size_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cbegin_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cbegin_neg.cc
index 4da34e4..016ae3e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cbegin_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cbegin_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cend_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cend_neg.cc
index ef59af6..318f4e9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cend_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cend_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc
index 44a8ac9..2807730 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc
index a83ffbd..3bca414 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc
index d7be31f..db865ee 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end1_neg.cc
index 0425c3c..cc0e37f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end2_neg.cc
index 630da51..9f129ce 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/end2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc
index b1831fc..dde90d1e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc
index f162cf5..e053ec8 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc
index 282f468..974e55d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc
index 8cf90df..1bbbaa3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_compare_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc
index 053ae09..3965d83 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/invalid_local_iterator_range_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc
index 916245b..252fb65 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc
index e28d180..7044bc6 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/max_load_factor_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc
index 5e50f8e..0e53680 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc
index 13c8798..73c433e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_erased_local_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc
index e092db9..d532f5a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc
index ebc3356..9dad84f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/use_invalid_local_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/60499.cc
index 5bba00e..d22651e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/60499.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60499
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc
index 761ec97..51fb6c6 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc
index 3d3a882..26880d0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/begin2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc
index efe3f41..a8d856f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/bucket_size_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc
index 4da34e4..016ae3e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cbegin_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cend_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cend_neg.cc
index ef59af6..318f4e9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cend_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cend_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc
index f1f1f73..348f89a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc
index 52b31cc..1a11da2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc
index a6da253..ff7708d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end1_neg.cc
index 0425c3c..cc0e37f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end2_neg.cc
index 630da51..9f129ce 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/end2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc
index 7e3e66f..80619e1 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc
index d00b90d..f9dfa53 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc
index ed26dfe..673a191 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc
index 39ae989..fccaa77 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_compare_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc
index aa6afde..33c4e5d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/invalid_local_iterator_range_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc
index eb56977..c4dff78 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc
index eeba909..45715d4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/max_load_factor_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc
index 146ba9a..e4294cc 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc
index 87a15bb..3872034 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_erased_local_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc
index 65a8d0a..bd5ff47 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc
index f4b5274..f9eae0e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/use_invalid_local_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_map>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/60499.cc
index c0be76e..aa7f818 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/60499.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60499
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc
index 61e1b2b..96a0df2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc
index e619e92..bf2019d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/begin2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc
index f59b8b8..ed2b990 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/bucket_size_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc
index 30f7161..b7b3825 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cbegin_neg.cc
@@ -15,8 +15,9 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
+
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cend_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cend_neg.cc
index f335e0a..f566ec3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cend_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cend_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc
index 58c9e52..2ad5ff1 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc
index f00c3e3..a8b2b64 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc
index df49bf7..206876a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end1_neg.cc
index c311001..69393d2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end2_neg.cc
index beeb356..eea80ed 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/end2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc
index 9f9437d..28daab5 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc
index 5c95a90..5dec12d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc
index 970b128..b10b59d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc
index eb84e0f..cb500a0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_compare_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc
index 37d7e86..cb678dd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/invalid_local_iterator_range_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc
index 0255fbf..dbcecc8 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc
index 9db1f40..d7e31e6 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/max_load_factor_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc
index 053357e..4750d08 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc
index c5264e3..d5e0a8e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_erased_local_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc
index b3ba736..6667046 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc
index 44f236f..927ee3b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/use_invalid_local_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/60499.cc
index 82cda7f..3055858 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/60499.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60499
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin1_neg.cc
index d30e9c2..ed0519f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin2_neg.cc
index c308f9b..c074135 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/begin2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc
index faaeffc..2543601 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/bucket_size_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cbegin_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cbegin_neg.cc
index d71399a..161c29c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cbegin_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cbegin_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cend_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cend_neg.cc
index b1f22a9..f1fa407 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cend_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cend_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc
index 6df1e2f..6eb11cd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc
index 14582ff..01a4479 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc
index 6c02578..4be9f40 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end1_neg.cc
index b4e0f47..a57d4a9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end2_neg.cc
index 20c8f5a..05a9fcb 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/end2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc
index 07de84c..6c9de87 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc
index 2b61e9f..68b1a89 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc
index f51d230..402b5e6 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc
index efef04a..15debce 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_compare_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc
index 8f66931..21ee941 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/invalid_local_iterator_range_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc
index 70a3e26..ee516d8 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc
index 22e3ffc..bf5a09b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/max_load_factor_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc
index 2f973a6..f48d7ee 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc
index 3a70fe6..5d45df2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_erased_local_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc
index bf784d1..171dbbf 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc
index 212e908..04e8c52 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/use_invalid_local_iterator_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <unordered_set>
#include <debug/unordered_checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc
index 462ad0e..6f5390e 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/52433
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/60499.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/60499.cc
index ab8e7f6..788ce2e 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/60499.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/60499.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile { target c++11 } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60499
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc
index 195dbce..e8f7918 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc
index bc293b2..c6f2389 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/iterator_self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/self_move_assign_neg.cc
index b843ed5..d82b6b7 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/self_move_assign_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/shrink_to_fit.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/shrink_to_fit.cc
index d41145e..0bd161a 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/shrink_to_fit.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
diff --git a/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc b/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc
index 3999946..d7e658a 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pop_heap/complexity.cc
@@ -15,9 +15,9 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+// { dg-do run { target c++11 } }
// { dg-require-normal-mode "" }
// { dg-require-cmath "" }
-// { dg-do run { target c++11 } }
#include <cmath>
#include <random>
diff --git a/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc b/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc
index c7c049c..089512b 100644
--- a/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/push_heap/complexity.cc
@@ -15,9 +15,9 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+// { dg-do run { target c++11 } }
// { dg-require-normal-mode "" }
// { dg-require-cmath "" }
-// { dg-do run { target c++11 } }
#include <cmath>
#include <random>
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc b/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc
index bb93780..cfcaae9 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort_heap/complexity.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-require-cmath "" }
// { dg-do run { target c++11 } }
+// { dg-require-cmath "" }
#include <cmath>
#include <random>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc b/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc
index 1524a57..2daa2dc 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/60658.cc
@@ -1,5 +1,5 @@
-// { dg-require-atomic-builtins "" }
// { dg-do run { target c++11 } }
+// { dg-require-atomic-builtins "" }
// Copyright (C) 2014-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc b/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc
index 06749a4..d491328 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/60695.cc
@@ -1,6 +1,6 @@
+// { dg-do compile { target c++11 } }
// { dg-require-atomic-builtins "" }
// { dg-options "-Wno-pedantic" }
-// { dg-do compile { target c++11 } }
// Copyright (C) 2014-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/62259.cc b/libstdc++-v3/testsuite/29_atomics/atomic/62259.cc
index a98b332..37d84ad 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/62259.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/62259.cc
@@ -15,9 +15,9 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+// { dg-do compile { target c++11 } }
// { dg-require-atomic-builtins "" }
// { dg-require-cstdint "" }
-// { dg-do compile { target c++11 } }
#include <atomic>
#include <cstdint>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/64658.cc b/libstdc++-v3/testsuite/29_atomics/atomic/64658.cc
index 7895b15..4a8369d 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/64658.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/64658.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-require-atomic-builtins "" }
// { dg-do run { target c++11 } }
+// { dg-require-atomic-builtins "" }
#include <atomic>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/49445.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/49445.cc
index 556bd0b..f4445de 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/49445.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/49445.cc
@@ -1,5 +1,5 @@
-// { dg-require-atomic-builtins "" }
// { dg-do run { target c++11 } }
+// { dg-require-atomic-builtins "" }
// Copyright (C) 2012-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc b/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc
index a1ec8ec..9aa7cb0 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/operators/51811.cc
@@ -1,5 +1,5 @@
-// { dg-require-atomic-builtins "" }
// { dg-do run { target c++11 } }
+// { dg-require-atomic-builtins "" }
// Copyright (C) 2012-2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc b/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
index e73c1bb..1535454 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/operators/pointer_partial_void.cc
@@ -1,5 +1,5 @@
-// { dg-require-atomic-builtins "" }
// { dg-do run { target c++11 } }
+// { dg-require-atomic-builtins "" }
// Copyright (C) 2012-2016 Free Software Foundation, Inc.
//
--
2.1.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [libstdc++-v3] Fix dg-require before dg-run directives in testsuite.
2016-09-02 13:18 [libstdc++-v3] Fix dg-require before dg-run directives in testsuite Matthew Wahab
@ 2016-09-06 10:16 ` Jonathan Wakely
2016-09-14 13:21 ` Christophe Lyon
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Wakely @ 2016-09-06 10:16 UTC (permalink / raw)
To: Matthew Wahab; +Cc: gcc-patches, libstdc++
On 02/09/16 14:17 +0100, Matthew Wahab wrote:
>Hello,
>
>Tests in the libstdc++-v3 testsuite were recently changed to use { dg-do
>.. { target c++11 } } instead of using a dg-options to set -std
>(https://gcc.gnu.org/ml/libstdc++/2016-08/msg00102.html). As a
>consequence, several tests were left with directive lists that had
>dg-require preceding dg-do. This meant that some tests were run when
>they should have been skipped as unsupported. In particular, most of the
>23_algorithms/*/complexity.cc tests became FAIL on aarch64-none-elf
>
>This patch adjusts the tests so that the dg-requires come after the
>dg-do directives. The makes the tests that were previously
>FAIL/UNRESOLVED become UNSUPPORTED. It also makes UNSUPPORTED some tests
>that were PASS.
>
>The tests that move from FAIL/UNRESOLVED to UNSUPPORTED:
>
>- 22_locale/locale/cons/unicode.cc.
>- 25_algorithms/{pop_heap,push_heap,sort_heap}/complexity.c.
>
From PASS to UNSUPPORTED:
>
>- 23_containers/*/debug/60499.c
>- 23_containers/vector/debug/52433.c
>
>Tested by running the testsuite for cross-compiled aarch64-none-elf.
>
>Ok for trunk?
Yes, thanks for cleaning this up.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [libstdc++-v3] Fix dg-require before dg-run directives in testsuite.
2016-09-06 10:16 ` Jonathan Wakely
@ 2016-09-14 13:21 ` Christophe Lyon
2016-09-14 13:36 ` Jonathan Wakely
0 siblings, 1 reply; 5+ messages in thread
From: Christophe Lyon @ 2016-09-14 13:21 UTC (permalink / raw)
To: Jonathan Wakely; +Cc: Matthew Wahab, gcc-patches, libstdc++
[-- Attachment #1: Type: text/plain, Size: 1643 bytes --]
On 6 September 2016 at 12:15, Jonathan Wakely <jwakely@redhat.com> wrote:
> On 02/09/16 14:17 +0100, Matthew Wahab wrote:
>>
>> Hello,
>>
>> Tests in the libstdc++-v3 testsuite were recently changed to use { dg-do
>> .. { target c++11 } } instead of using a dg-options to set -std
>> (https://gcc.gnu.org/ml/libstdc++/2016-08/msg00102.html). As a
>> consequence, several tests were left with directive lists that had
>> dg-require preceding dg-do. This meant that some tests were run when
>> they should have been skipped as unsupported. In particular, most of the
>> 23_algorithms/*/complexity.cc tests became FAIL on aarch64-none-elf
>>
>> This patch adjusts the tests so that the dg-requires come after the
>> dg-do directives. The makes the tests that were previously
>> FAIL/UNRESOLVED become UNSUPPORTED. It also makes UNSUPPORTED some tests
>> that were PASS.
>>
>> The tests that move from FAIL/UNRESOLVED to UNSUPPORTED:
>>
>> - 22_locale/locale/cons/unicode.cc.
>> - 25_algorithms/{pop_heap,push_heap,sort_heap}/complexity.c.
>>
>> From PASS to UNSUPPORTED:
>>
>> - 23_containers/*/debug/60499.c
>> - 23_containers/vector/debug/52433.c
>>
>> Tested by running the testsuite for cross-compiled aarch64-none-elf.
>>
>> Ok for trunk?
>
>
> Yes, thanks for cleaning this up.
>
>
Hello,
It seems some tests still have dg-require or dg-skip before dg-do.
The attached patch fixes that, the only effect is that
25_algorithms/lower_bound/debug/irreflexive.cc
is now UNSUPPORTED instead of PASS on arm* and aarch64* targets.
I'm not sure if that's expected. I do see: "#error No debug mode" in the logs.
OK for trunk?
Thanks,
Christophe
[-- Attachment #2: fix-dg.log.txt --]
[-- Type: text/plain, Size: 1981 bytes --]
libstdc++-v3/ChangeLog:
2016-09-14 Christophe Lyon <christophe.lyon@linaro.org>
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc:
Move dg-do directive before dg-skip.
* testsuite/21_strings/debug/iterator_self_move_assign_neg.cc:
Move dg-do directive before dg-require.
* testsuite/21_strings/debug/self_move_assign_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/57779_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/60587_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/assign1_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/assign2_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/assign3_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/construct1_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/construct2_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/construct3_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/insert1_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/insert2_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/insert3_neg.cc: Likewise.
* testsuite/23_containers/vector/debug/insert5_neg.cc: Likewise.
* testsuite/25_algorithms/lower_bound/debug/irreflexive.cc: Likewise.
* testsuite/25_algorithms/partial_sort_copy/debug/irreflexive_neg.cc:
Likewise.
* testsuite/25_algorithms/pop_heap/empty2_neg.cc: Likewise.
* testsuite/25_algorithms/pop_heap/empty_neg.cc: Likewise.
* testsuite/27_io/objects/char/12048-5.cc: Likewise.
* testsuite/ext/special_functions/conf_hyperg/check_nan.cc: Likewise.
* testsuite/ext/special_functions/hyperg/check_nan.cc: Likewise.
gcc/testsuite/ChangeLog:
2016-09-14 Christophe Lyon <christophe.lyon@linaro.org>
* g++.dg/cpp0x/lambda/lambda-mangle.C: Move dg-do directive before
dg-require.
* g++.dg/ext/builtin_alloca.C: Likewise.
* g++.dg/template/spec35.C: Likewise.
* gcc.dg/builtins-68.c: Likewise.
* gcc.misc-tests/gcov-13.c: Likewise.
* gcc.misc-tests/gcov-14.c: Likewise.
[-- Attachment #3: fix-dg.patch.txt --]
[-- Type: text/plain, Size: 16125 bytes --]
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C
index 20ef282..15b8b79 100644
--- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-mangle.C
@@ -1,6 +1,6 @@
// Test lambda mangling
-// { dg-require-weak "" }
// { dg-do compile { target c++11 } }
+// { dg-require-weak "" }
// { dg-options "-fno-inline" }
template<typename F> int algo(F fn) { return fn(); }
diff --git a/gcc/testsuite/g++.dg/ext/builtin_alloca.C b/gcc/testsuite/g++.dg/ext/builtin_alloca.C
index 7a0d331..e857502 100644
--- a/gcc/testsuite/g++.dg/ext/builtin_alloca.C
+++ b/gcc/testsuite/g++.dg/ext/builtin_alloca.C
@@ -1,7 +1,7 @@
// PR middle-end/69780 - [4.9/5/6 Regression] ICE on
// __builtin_alloca_with_align with small alignment
-// { dg-require-effective-target alloca }
// { dg-do compile }
+// { dg-require-effective-target alloca }
#define CHAR_BIT __CHAR_BIT__
#define SIZE_MAX __SIZE_MAX__
diff --git a/gcc/testsuite/g++.dg/template/spec35.C b/gcc/testsuite/g++.dg/template/spec35.C
index 709ece5..e82323c 100644
--- a/gcc/testsuite/g++.dg/template/spec35.C
+++ b/gcc/testsuite/g++.dg/template/spec35.C
@@ -2,8 +2,8 @@
// C++ DR 605 -- "...the linkage of an explicit specialization must be that of
// the template."
-// { dg-require-weak "" }
// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-require-weak "" }
template<class T>
static void f1 (T) { }
diff --git a/gcc/testsuite/gcc.dg/builtins-68.c b/gcc/testsuite/gcc.dg/builtins-68.c
index c0cc1eb..1247394 100644
--- a/gcc/testsuite/gcc.dg/builtins-68.c
+++ b/gcc/testsuite/gcc.dg/builtins-68.c
@@ -1,7 +1,7 @@
/* PR middle-end/69780 - [4.9/5/6 Regression] ICE on
__builtin_alloca_with_align with small alignment */
-/* { dg-require-effective-target alloca } */
/* { dg-do compile } */
+/* { dg-require-effective-target alloca } */
/* { dg-options "-Wno-long-long" } */
#define CHAR_BIT __CHAR_BIT__
diff --git a/gcc/testsuite/gcc.misc-tests/gcov-13.c b/gcc/testsuite/gcc.misc-tests/gcov-13.c
index e443f48..2c80559 100644
--- a/gcc/testsuite/gcc.misc-tests/gcov-13.c
+++ b/gcc/testsuite/gcc.misc-tests/gcov-13.c
@@ -1,8 +1,8 @@
/* Test gcov weak ellision. */
+/* { dg-do run { target native } } */
/* { dg-options "-fprofile-arcs -ftest-coverage" } */
/* { dg-require-weak "" } */
-/* { dg-do run { target native } } */
/* { dg-additional-sources "gcovpart-13b.c" } */
/* { dg-skip-if "weak ellision not supported" { { hppa*-*-hpux* } && { ! lp64 } } { "*" } { "" } } */
diff --git a/gcc/testsuite/gcc.misc-tests/gcov-14.c b/gcc/testsuite/gcc.misc-tests/gcov-14.c
index 78dd7be..2bebf7e 100644
--- a/gcc/testsuite/gcc.misc-tests/gcov-14.c
+++ b/gcc/testsuite/gcc.misc-tests/gcov-14.c
@@ -1,10 +1,10 @@
/* Test gcov extern inline. */
+/* { dg-do run { target native } } */
/* { dg-options "-O2 -fprofile-arcs -ftest-coverage -fgnu89-inline" } */
/* The following line arranges that Darwin has behavior like elf weak import. */
/* { dg-additional-options "-flat_namespace -undefined suppress" { target *-*-darwin* } } */
/* { dg-require-weak "" } */
-/* { dg-do run { target native } } */
/* { dg-skip-if "undefined weak not supported" { { hppa*-*-hpux* } && { ! lp64 } } } */
/* { dg-skip-if "undefined weak not supported" { powerpc-ibm-aix* } } */
diff --git a/libstdc++-v3/testsuite/21_strings/debug/iterator_self_move_assign_neg.cc b/libstdc++-v3/testsuite/21_strings/debug/iterator_self_move_assign_neg.cc
index 6d10bb1..f481115 100644
--- a/libstdc++-v3/testsuite/21_strings/debug/iterator_self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/21_strings/debug/iterator_self_move_assign_neg.cc
@@ -15,9 +15,9 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
+// { dg-do run { xfail *-*-* } }
// { dg-require-debug-mode "" }
// { dg-options "-std=gnu++11" }
-// { dg-do run { xfail *-*-* } }
#include <debug/string>
diff --git a/libstdc++-v3/testsuite/21_strings/debug/self_move_assign_neg.cc b/libstdc++-v3/testsuite/21_strings/debug/self_move_assign_neg.cc
index 360f077..a72cb87 100644
--- a/libstdc++-v3/testsuite/21_strings/debug/self_move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/21_strings/debug/self_move_assign_neg.cc
@@ -15,9 +15,9 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
+// { dg-do run { xfail *-*-* } }
// { dg-require-debug-mode "" }
// { dg-options "-std=gnu++11" }
-// { dg-do run { xfail *-*-* } }
#include <debug/string>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc
index bcd548c..fd94c78 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc
@@ -17,8 +17,8 @@
// 23.2.5 class vector<bool> [lib.vector.bool]
-// { dg-skip-if "" { powerpc64-*-freebsd* } { "*" } { "" } }
// { dg-do run { xfail *-*-darwin8.[0-4].* } }
+// { dg-skip-if "" { powerpc64-*-freebsd* } { "*" } { "" } }
#include <vector>
#include <stdexcept>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/57779_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/57779_neg.cc
index d0fb7fc..bb9b35e 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/57779_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/57779_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/60587_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/60587_neg.cc
index ae205be..51ebc84 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/60587_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/60587_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
// PR libstdc++/60587
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/assign1_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/assign1_neg.cc
index 9b0866d..9ee2067 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/assign1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/assign1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/assign2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/assign2_neg.cc
index aca8657..974c80a 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/assign2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/assign2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/assign3_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/assign3_neg.cc
index a6c36bb..ac4aabd 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/assign3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/assign3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/construct1_neg.cc
index 723cce0..0e51ca3 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/construct1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/construct2_neg.cc
index 24e659f..5c91dad 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/construct2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/construct3_neg.cc
index 245c6bf..63b3e1a 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/construct3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/insert1_neg.cc
index c43e3ad..9d09983 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/insert1_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/insert2_neg.cc
index 80b8e17..4d8632c 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/insert2_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/insert3_neg.cc
index 000643d..6514cca 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/insert3_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/insert5_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/insert5_neg.cc
index ee65e6f..1cb29ec 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/insert5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/insert5_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <vector>
#include <debug/checks.h>
diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/irreflexive.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/irreflexive.cc
index 1554df0..08a3170 100644
--- a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/irreflexive.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/irreflexive.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do compile }
+// { dg-require-debug-mode "" }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/debug/irreflexive_neg.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/debug/irreflexive_neg.cc
index 1ebc3bd..52076aa 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/debug/irreflexive_neg.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/debug/irreflexive_neg.cc
@@ -15,8 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
//
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/25_algorithms/pop_heap/empty2_neg.cc b/libstdc++-v3/testsuite/25_algorithms/pop_heap/empty2_neg.cc
index e30533f..5bc2d99 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pop_heap/empty2_neg.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pop_heap/empty2_neg.cc
@@ -17,8 +17,8 @@
// 25.3.6 Heap operations [lib.alg.heap.operations]
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <algorithm>
#include <functional>
diff --git a/libstdc++-v3/testsuite/25_algorithms/pop_heap/empty_neg.cc b/libstdc++-v3/testsuite/25_algorithms/pop_heap/empty_neg.cc
index 358fb90..96c1ab9 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pop_heap/empty_neg.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pop_heap/empty_neg.cc
@@ -17,8 +17,8 @@
// 25.3.6 Heap operations [lib.alg.heap.operations]
-// { dg-require-debug-mode "" }
// { dg-do run { xfail *-*-* } }
+// { dg-require-debug-mode "" }
#include <algorithm>
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc
index 40cf752..582ba35 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc
@@ -22,9 +22,8 @@
// equivalent and interchangable. Currently however, cin.rdbuf()->sungetc()
// only returns characters that were read with cin.rdbuf()->sbumpc()
-// { dg-require-fileio "" }
-
// { dg-do run { xfail *-*-* } }
+// { dg-require-fileio "" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/ext/special_functions/conf_hyperg/check_nan.cc b/libstdc++-v3/testsuite/ext/special_functions/conf_hyperg/check_nan.cc
index d6108d5..6c4f8fa 100644
--- a/libstdc++-v3/testsuite/ext/special_functions/conf_hyperg/check_nan.cc
+++ b/libstdc++-v3/testsuite/ext/special_functions/conf_hyperg/check_nan.cc
@@ -1,7 +1,7 @@
+// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
-// { dg-do run { target c++11 } }
// Copyright (C) 2016 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/ext/special_functions/hyperg/check_nan.cc b/libstdc++-v3/testsuite/ext/special_functions/hyperg/check_nan.cc
index 8806a3c..31b81a6 100644
--- a/libstdc++-v3/testsuite/ext/special_functions/hyperg/check_nan.cc
+++ b/libstdc++-v3/testsuite/ext/special_functions/hyperg/check_nan.cc
@@ -1,7 +1,7 @@
+// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
-// { dg-do run { target c++11 } }
// Copyright (C) 2016 Free Software Foundation, Inc.
//
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [libstdc++-v3] Fix dg-require before dg-run directives in testsuite.
2016-09-14 13:21 ` Christophe Lyon
@ 2016-09-14 13:36 ` Jonathan Wakely
2016-09-14 13:41 ` Christophe Lyon
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Wakely @ 2016-09-14 13:36 UTC (permalink / raw)
To: Christophe Lyon; +Cc: Matthew Wahab, gcc-patches, libstdc++
On 14/09/16 15:17 +0200, Christophe Lyon wrote:
>It seems some tests still have dg-require or dg-skip before dg-do.
>The attached patch fixes that, the only effect is that
>25_algorithms/lower_bound/debug/irreflexive.cc
>is now UNSUPPORTED instead of PASS on arm* and aarch64* targets.
>
>I'm not sure if that's expected. I do see: "#error No debug mode" in the logs.
It's expected, because it has dg-require-debug-mode, so the test
should only run when doing make check-debug, or adding
-D_GLIBCXX_DEBUG to the options used for testing.
It passes in normal mode too, but doesn't test anything very
interesting, so doesn't need to be tested.
>OK for trunk?
Yes, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [libstdc++-v3] Fix dg-require before dg-run directives in testsuite.
2016-09-14 13:36 ` Jonathan Wakely
@ 2016-09-14 13:41 ` Christophe Lyon
0 siblings, 0 replies; 5+ messages in thread
From: Christophe Lyon @ 2016-09-14 13:41 UTC (permalink / raw)
To: Jonathan Wakely; +Cc: Matthew Wahab, gcc-patches, libstdc++
On 14 September 2016 at 15:27, Jonathan Wakely <jwakely@redhat.com> wrote:
> On 14/09/16 15:17 +0200, Christophe Lyon wrote:
>>
>> It seems some tests still have dg-require or dg-skip before dg-do.
>> The attached patch fixes that, the only effect is that
>> 25_algorithms/lower_bound/debug/irreflexive.cc
>> is now UNSUPPORTED instead of PASS on arm* and aarch64* targets.
>>
>> I'm not sure if that's expected. I do see: "#error No debug mode" in the
>> logs.
>
>
> It's expected, because it has dg-require-debug-mode, so the test
> should only run when doing make check-debug, or adding
> -D_GLIBCXX_DEBUG to the options used for testing.
>
> It passes in normal mode too, but doesn't test anything very
> interesting, so doesn't need to be tested.
>
Thanks for the explanation.
Committed as r240135.
Christophe
>> OK for trunk?
>
>
> Yes, thanks.
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-09-14 13:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-02 13:18 [libstdc++-v3] Fix dg-require before dg-run directives in testsuite Matthew Wahab
2016-09-06 10:16 ` Jonathan Wakely
2016-09-14 13:21 ` Christophe Lyon
2016-09-14 13:36 ` Jonathan Wakely
2016-09-14 13:41 ` Christophe Lyon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).