57619.C: Rename to 57619.cc.

2016-10-17  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/unordered_map/insert/57619.C: Rename to 57619.cc.
	* testsuite/23_containers/unordered_multimap/insert/57619.C: Likewise.

2016-10-17  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/array/capacity/empty.cc: Remove 'test' variables.
	* testsuite/array/capacity/max_size.cc: Likewise.
	* testsuite/array/capacity/size.cc: Likewise.
	* testsuite/array/comparison_operators/equal.cc: Likewise.
	* testsuite/array/comparison_operators/greater.cc: Likewise.
	* testsuite/array/comparison_operators/greater_or_equal.cc: Likewise.
	* testsuite/array/comparison_operators/less.cc: Likewise.
	* testsuite/array/comparison_operators/less_or_equal.cc: Likewise.
	* testsuite/array/comparison_operators/not_equal.cc: Likewise.
	* testsuite/array/element_access/54388.cc: Likewise.
	* testsuite/array/element_access/at_out_of_range.cc: Likewise.
	* testsuite/array/element_access/back.cc: Likewise.
	* testsuite/array/element_access/data.cc: Likewise.
	* testsuite/array/element_access/front.cc: Likewise.
	* testsuite/array/iterators/end_is_one_past.cc: Likewise.
	* testsuite/array/requirements/contiguous.cc: Likewise.
	* testsuite/array/requirements/fill.cc: Likewise.
	* testsuite/array/requirements/member_swap.cc: Likewise.
	* testsuite/array/requirements/zero_sized_arrays.cc: Likewise.
	* testsuite/array/specialized_algorithms/swap.cc: Likewise.
	* testsuite/array/tuple_interface/tuple_element.cc: Likewise.
	* testsuite/array/tuple_interface/tuple_element_cpp14.cc: Likewise.
	* testsuite/array/tuple_interface/tuple_size.cc: Likewise.
	* testsuite/bitset/all/1.cc: Likewise.
	* testsuite/bitset/cons/1.cc: Likewise.
	* testsuite/bitset/cons/16020.cc: Likewise.
	* testsuite/bitset/cons/2.cc: Likewise.
	* testsuite/bitset/cons/3.cc: Likewise.
	* testsuite/bitset/cons/50268.cc: Likewise.
	* testsuite/bitset/cons/6282.cc: Likewise.
	* testsuite/bitset/cons/dr1325-2.cc: Likewise.
	* testsuite/bitset/cons/dr396.cc: Likewise.
	* testsuite/bitset/ext/15361.cc: Likewise.
	* testsuite/bitset/input/1.cc: Likewise.
	* testsuite/bitset/operations/1.cc: Likewise.
	* testsuite/bitset/operations/13838.cc: Likewise.
	* testsuite/bitset/operations/2.cc: Likewise.
	* testsuite/bitset/test/1.cc: Likewise.
	* testsuite/bitset/to_string/1.cc: Likewise.
	* testsuite/bitset/to_string/dr396.cc: Likewise.
	* testsuite/bitset/to_ullong/1.cc: Likewise.
	* testsuite/bitset/to_ulong/1.cc: Likewise.
	* testsuite/deque/allocator/copy.cc: Likewise.
	* testsuite/deque/allocator/copy_assign.cc: Likewise.
	* testsuite/deque/allocator/ext_ptr.cc: Likewise.
	* testsuite/deque/allocator/minimal.cc: Likewise.
	* testsuite/deque/allocator/move.cc: Likewise.
	* testsuite/deque/allocator/move_assign.cc: Likewise.
	* testsuite/deque/allocator/swap.cc: Likewise.
	* testsuite/deque/capacity/29134-2.cc: Likewise.
	* testsuite/deque/capacity/29134.cc: Likewise.
	* testsuite/deque/capacity/moveable.cc: Likewise.
	* testsuite/deque/capacity/resize_size.cc: Likewise.
	* testsuite/deque/capacity/shrink_to_fit.cc: Likewise.
	* testsuite/deque/cons/1.cc: Likewise.
	* testsuite/deque/cons/2.cc: Likewise.
	* testsuite/deque/cons/assign/1.cc: Likewise.
	* testsuite/deque/cons/cons_size.cc: Likewise.
	* testsuite/deque/cons/moveable.cc: Likewise.
	* testsuite/deque/modifiers/erase/1.cc: Likewise.
	* testsuite/deque/modifiers/erase/2.cc: Likewise.
	* testsuite/deque/modifiers/erase/3.cc: Likewise.
	* testsuite/deque/modifiers/erase/moveable.cc: Likewise.
	* testsuite/deque/modifiers/moveable.cc: Likewise.
	* testsuite/deque/modifiers/push_back/49836.cc: Likewise.
	* testsuite/deque/modifiers/push_front/49836.cc: Likewise.
	* testsuite/deque/modifiers/swap/1.cc: Likewise.
	* testsuite/deque/modifiers/swap/2.cc: Likewise.
	* testsuite/deque/modifiers/swap/3.cc: Likewise.
	* testsuite/deque/operators/1.cc: Likewise.
	* testsuite/deque/operators/2.cc: Likewise.
	* testsuite/forward_list/allocator/copy.cc: Likewise.
	* testsuite/forward_list/allocator/copy_assign.cc: Likewise.
	* testsuite/forward_list/allocator/ext_ptr.cc: Likewise.
	* testsuite/forward_list/allocator/minimal.cc: Likewise.
	* testsuite/forward_list/allocator/move.cc: Likewise.
	* testsuite/forward_list/allocator/move_assign.cc: Likewise.
	* testsuite/forward_list/allocator/swap.cc: Likewise.
	* testsuite/forward_list/capacity/1.cc: Likewise.
	* testsuite/forward_list/capacity/resize_size.cc: Likewise.
	* testsuite/forward_list/comparable.cc: Likewise.
	* testsuite/forward_list/cons/1.cc: Likewise.
	* testsuite/forward_list/cons/2.cc: Likewise.
	* testsuite/forward_list/cons/3.cc: Likewise.
	* testsuite/forward_list/cons/4.cc: Likewise.
	* testsuite/forward_list/cons/5.cc: Likewise.
	* testsuite/forward_list/cons/6.cc: Likewise.
	* testsuite/forward_list/cons/7.cc: Likewise.
	* testsuite/forward_list/cons/8.cc: Likewise.
	* testsuite/forward_list/cons/9.cc: Likewise.
	* testsuite/forward_list/cons/cons_size.cc: Likewise.
	* testsuite/forward_list/cons/moveable.cc: Likewise.
	* testsuite/forward_list/debug/clear.cc: Likewise.
	* testsuite/forward_list/debug/construct4_neg.cc: Likewise.
	* testsuite/forward_list/debug/erase_after1_neg.cc: Likewise.
	* testsuite/forward_list/debug/move_assign_neg.cc: Likewise.
	* testsuite/forward_list/debug/move_constructor.cc: Likewise.
	* testsuite/forward_list/debug/move_neg.cc: Likewise.
	* testsuite/forward_list/debug/splice_after.cc: Likewise.
	* testsuite/forward_list/debug/swap.cc: Likewise.
	* testsuite/forward_list/modifiers/1.cc: Likewise.
	* testsuite/forward_list/modifiers/2.cc: Likewise.
	* testsuite/forward_list/modifiers/3.cc: Likewise.
	* testsuite/forward_list/modifiers/4.cc: Likewise.
	* testsuite/forward_list/modifiers/5.cc: Likewise.
	* testsuite/forward_list/modifiers/6.cc: Likewise.
	* testsuite/forward_list/operations/1.cc: Likewise.
	* testsuite/forward_list/operations/2.cc: Likewise.
	* testsuite/forward_list/operations/3.cc: Likewise.
	* testsuite/forward_list/operations/4.cc: Likewise.
	* testsuite/forward_list/operations/5.cc: Likewise.
	* testsuite/forward_list/operations/6.cc: Likewise.
	* testsuite/forward_list/operations/7.cc: Likewise.
	* testsuite/forward_list/operations/remove_freed.cc: Likewise.
	* testsuite/list/61347.cc: Likewise.
	* testsuite/list/allocator/copy.cc: Likewise.
	* testsuite/list/allocator/copy_assign.cc: Likewise.
	* testsuite/list/allocator/minimal.cc: Likewise.
	* testsuite/list/allocator/move.cc: Likewise.
	* testsuite/list/allocator/move_assign.cc: Likewise.
	* testsuite/list/allocator/swap.cc: Likewise.
	* testsuite/list/capacity/1.h: Likewise.
	* testsuite/list/capacity/29134.cc: Likewise.
	* testsuite/list/capacity/resize_size.cc: Likewise.
	* testsuite/list/cons/1.h: Likewise.
	* testsuite/list/cons/2.h: Likewise.
	* testsuite/list/cons/3.h: Likewise.
	* testsuite/list/cons/4.h: Likewise.
	* testsuite/list/cons/5.h: Likewise.
	* testsuite/list/cons/6.h: Likewise.
	* testsuite/list/cons/7.h: Likewise.
	* testsuite/list/cons/8.h: Likewise.
	* testsuite/list/cons/9.h: Likewise.
	* testsuite/list/cons/cons_size.cc: Likewise.
	* testsuite/list/cons/moveable.h: Likewise.
	* testsuite/list/debug/invalidation/1.cc: Likewise.
	* testsuite/list/debug/invalidation/2.cc: Likewise.
	* testsuite/list/debug/invalidation/3.cc: Likewise.
	* testsuite/list/debug/invalidation/4.cc: Likewise.
	* testsuite/list/modifiers/1.h: Likewise.
	* testsuite/list/modifiers/2.h: Likewise.
	* testsuite/list/modifiers/3.h: Likewise.
	* testsuite/list/modifiers/insert/25288.h: Likewise.
	* testsuite/list/modifiers/swap/1.h: Likewise.
	* testsuite/list/modifiers/swap/2.h: Likewise.
	* testsuite/list/modifiers/swap/3.h: Likewise.
	* testsuite/list/operations/1.h: Likewise.
	* testsuite/list/operations/2.h: Likewise.
	* testsuite/list/operations/3.h: Likewise.
	* testsuite/list/operations/4.h: Likewise.
	* testsuite/list/operations/42352.cc: Likewise.
	* testsuite/map/allocator/copy.cc: Likewise.
	* testsuite/map/allocator/copy_assign.cc: Likewise.
	* testsuite/map/allocator/init-list.cc: Likewise.
	* testsuite/map/allocator/minimal.cc: Likewise.
	* testsuite/map/allocator/move.cc: Likewise.
	* testsuite/map/allocator/move_assign.cc: Likewise.
	* testsuite/map/allocator/swap.cc: Likewise.
	* testsuite/map/capacity/29134.cc: Likewise.
	* testsuite/map/cons/moveable.cc: Likewise.
	* testsuite/map/debug/construct5_neg.cc: Likewise.
	* testsuite/map/debug/move_assign_neg.cc: Likewise.
	* testsuite/map/debug/move_neg.cc: Likewise.
	* testsuite/map/element_access/1.cc: Likewise.
	* testsuite/map/element_access/2.cc: Likewise.
	* testsuite/map/element_access/39901.cc: Likewise.
	* testsuite/map/init-list.cc: Likewise.
	* testsuite/map/modifiers/dr130.cc: Likewise.
	* testsuite/map/modifiers/emplace/1.cc: Likewise.
	* testsuite/map/modifiers/extract.cc: Likewise.
	* testsuite/map/modifiers/insert/1.cc: Likewise.
	* testsuite/map/modifiers/insert/16813.cc: Likewise.
	* testsuite/map/modifiers/insert/2.cc: Likewise.
	* testsuite/map/modifiers/insert/3.cc: Likewise.
	* testsuite/map/modifiers/insert/4.cc: Likewise.
	* testsuite/map/modifiers/insert/5.cc: Likewise.
	* testsuite/map/modifiers/insert_or_assign/1.cc: Likewise.
	* testsuite/map/modifiers/merge.cc: Likewise.
	* testsuite/map/modifiers/swap/1.cc: Likewise.
	* testsuite/map/modifiers/swap/2.cc: Likewise.
	* testsuite/map/modifiers/swap/3.cc: Likewise.
	* testsuite/map/modifiers/try_emplace/1.cc: Likewise.
	* testsuite/map/operations/1.cc: Likewise.
	* testsuite/map/operations/count.cc: Likewise.
	* testsuite/map/operators/1_neg.cc: Likewise.
	* testsuite/map/operators/2.cc: Likewise.
	* testsuite/multimap/allocator/copy.cc: Likewise.
	* testsuite/multimap/allocator/copy_assign.cc: Likewise.
	* testsuite/multimap/allocator/init-list.cc: Likewise.
	* testsuite/multimap/allocator/minimal.cc: Likewise.
	* testsuite/multimap/allocator/move.cc: Likewise.
	* testsuite/multimap/allocator/move_assign.cc: Likewise.
	* testsuite/multimap/allocator/swap.cc: Likewise.
	* testsuite/multimap/capacity/29134.cc: Likewise.
	* testsuite/multimap/cons/moveable.cc: Likewise.
	* testsuite/multimap/debug/construct5_neg.cc: Likewise.
	* testsuite/multimap/debug/move_assign_neg.cc: Likewise.
	* testsuite/multimap/debug/move_neg.cc: Likewise.
	* testsuite/multimap/init-list.cc: Likewise.
	* testsuite/multimap/modifiers/dr130.cc: Likewise.
	* testsuite/multimap/modifiers/emplace/1.cc: Likewise.
	* testsuite/multimap/modifiers/extract.cc: Likewise.
	* testsuite/multimap/modifiers/insert/1.cc: Likewise.
	* testsuite/multimap/modifiers/insert/2.cc: Likewise.
	* testsuite/multimap/modifiers/insert/22102.cc: Likewise.
	* testsuite/multimap/modifiers/insert/3.cc: Likewise.
	* testsuite/multimap/modifiers/insert/4.cc: Likewise.
	* testsuite/multimap/modifiers/merge.cc: Likewise.
	* testsuite/multimap/modifiers/swap/1.cc: Likewise.
	* testsuite/multimap/modifiers/swap/2.cc: Likewise.
	* testsuite/multimap/modifiers/swap/3.cc: Likewise.
	* testsuite/multimap/operations/1.cc: Likewise.
	* testsuite/multimap/operations/count.cc: Likewise.
	* testsuite/multiset/allocator/copy.cc: Likewise.
	* testsuite/multiset/allocator/copy_assign.cc: Likewise.
	* testsuite/multiset/allocator/init-list.cc: Likewise.
	* testsuite/multiset/allocator/minimal.cc: Likewise.
	* testsuite/multiset/allocator/move.cc: Likewise.
	* testsuite/multiset/allocator/move_assign.cc: Likewise.
	* testsuite/multiset/allocator/swap.cc: Likewise.
	* testsuite/multiset/capacity/29134.cc: Likewise.
	* testsuite/multiset/cons/moveable.cc: Likewise.
	* testsuite/multiset/debug/construct5_neg.cc: Likewise.
	* testsuite/multiset/debug/invalidation/2.cc: Likewise.
	* testsuite/multiset/debug/move_assign_neg.cc: Likewise.
	* testsuite/multiset/debug/move_neg.cc: Likewise.
	* testsuite/multiset/init-list.cc: Likewise.
	* testsuite/multiset/modifiers/dr130.cc: Likewise.
	* testsuite/multiset/modifiers/emplace/1.cc: Likewise.
	* testsuite/multiset/modifiers/extract.cc: Likewise.
	* testsuite/multiset/modifiers/insert/1.cc: Likewise.
	* testsuite/multiset/modifiers/insert/2.cc: Likewise.
	* testsuite/multiset/modifiers/insert/22102.cc: Likewise.
	* testsuite/multiset/modifiers/insert/3.cc: Likewise.
	* testsuite/multiset/modifiers/insert/4.cc: Likewise.
	* testsuite/multiset/modifiers/merge.cc: Likewise.
	* testsuite/multiset/modifiers/swap/1.cc: Likewise.
	* testsuite/multiset/modifiers/swap/2.cc: Likewise.
	* testsuite/multiset/modifiers/swap/3.cc: Likewise.
	* testsuite/multiset/operations/1.cc: Likewise.
	* testsuite/multiset/operations/count.cc: Likewise.
	* testsuite/priority_queue/moveable.cc: Likewise.
	* testsuite/queue/moveable.cc: Likewise.
	* testsuite/set/allocator/copy.cc: Likewise.
	* testsuite/set/allocator/copy_assign.cc: Likewise.
	* testsuite/set/allocator/init-list.cc: Likewise.
	* testsuite/set/allocator/minimal.cc: Likewise.
	* testsuite/set/allocator/move.cc: Likewise.
	* testsuite/set/allocator/move_assign.cc: Likewise.
	* testsuite/set/allocator/swap.cc: Likewise.
	* testsuite/set/capacity/29134.cc: Likewise.
	* testsuite/set/cons/moveable.cc: Likewise.
	* testsuite/set/debug/construct5_neg.cc: Likewise.
	* testsuite/set/debug/invalidation/2.cc: Likewise.
	* testsuite/set/debug/move_assign_neg.cc: Likewise.
	* testsuite/set/debug/move_neg.cc: Likewise.
	* testsuite/set/init-list.cc: Likewise.
	* testsuite/set/modifiers/17948.cc: Likewise.
	* testsuite/set/modifiers/dr130.cc: Likewise.
	* testsuite/set/modifiers/emplace/1.cc: Likewise.
	* testsuite/set/modifiers/extract.cc: Likewise.
	* testsuite/set/modifiers/insert/1.cc: Likewise.
	* testsuite/set/modifiers/insert/2.cc: Likewise.
	* testsuite/set/modifiers/insert/3.cc: Likewise.
	* testsuite/set/modifiers/merge.cc: Likewise.
	* testsuite/set/modifiers/swap/1.cc: Likewise.
	* testsuite/set/modifiers/swap/2.cc: Likewise.
	* testsuite/set/modifiers/swap/3.cc: Likewise.
	* testsuite/set/operations/1.cc: Likewise.
	* testsuite/set/operations/count.cc: Likewise.
	* testsuite/set/operators/1_neg.cc: Likewise.
	* testsuite/unordered_map/allocator/copy.cc: Likewise.
	* testsuite/unordered_map/allocator/copy_assign.cc: Likewise.
	* testsuite/unordered_map/allocator/minimal.cc: Likewise.
	* testsuite/unordered_map/allocator/move.cc: Likewise.
	* testsuite/unordered_map/allocator/move_assign.cc: Likewise.
	* testsuite/unordered_map/allocator/swap.cc: Likewise.
	* testsuite/unordered_map/cons/moveable.cc: Likewise.
	* testsuite/unordered_map/debug/construct5_neg.cc: Likewise.
	* testsuite/unordered_map/debug/move_assign_neg.cc: Likewise.
	* testsuite/unordered_map/debug/move_neg.cc: Likewise.
	* testsuite/unordered_map/dr761.cc: Likewise.
	* testsuite/unordered_map/erase/1.cc: Likewise.
	* testsuite/unordered_map/erase/24061-map.cc: Likewise.
	* testsuite/unordered_map/erase/54276.cc: Likewise.
	* testsuite/unordered_map/hash_policy/dr1189.cc: Likewise.
	* testsuite/unordered_map/init-list.cc: Likewise.
	* testsuite/unordered_map/insert/24061-map.cc: Likewise.
	* testsuite/unordered_map/insert/57619.C: Likewise.
	* testsuite/unordered_map/insert/array_syntax.cc: Likewise.
	* testsuite/unordered_map/insert/array_syntax_move.cc: Likewise.
	* testsuite/unordered_map/insert/map_range.cc: Likewise.
	* testsuite/unordered_map/insert/map_single.cc: Likewise.
	* testsuite/unordered_map/insert/map_single_move-1.cc: Likewise.
	* testsuite/unordered_map/insert/map_single_move-2.cc: Likewise.
	* testsuite/unordered_map/modifiers/61667.cc: Likewise.
	* testsuite/unordered_map/modifiers/emplace.cc: Likewise.
	* testsuite/unordered_map/modifiers/extract.cc: Likewise.
	* testsuite/unordered_map/modifiers/insert_or_assign.cc: Likewise.
	* testsuite/unordered_map/modifiers/merge.cc: Likewise.
	* testsuite/unordered_map/modifiers/reserve.cc: Likewise.
	* testsuite/unordered_map/modifiers/try_emplace.cc: Likewise.
	* testsuite/unordered_map/operations/count.cc: Likewise.
	* testsuite/unordered_map/operators/1.cc: Likewise.
	* testsuite/unordered_map/operators/2.cc: Likewise.
	* testsuite/unordered_multimap/allocator/copy.cc: Likewise.
	* testsuite/unordered_multimap/allocator/copy_assign.cc: Likewise.
	* testsuite/unordered_multimap/allocator/minimal.cc: Likewise.
	* testsuite/unordered_multimap/allocator/move.cc: Likewise.
	* testsuite/unordered_multimap/allocator/move_assign.cc: Likewise.
	* testsuite/unordered_multimap/allocator/swap.cc: Likewise.
	* testsuite/unordered_multimap/cons/moveable.cc: Likewise.
	* testsuite/unordered_multimap/debug/construct5_neg.cc: Likewise.
	* testsuite/unordered_multimap/debug/move_assign_neg.cc: Likewise.
	* testsuite/unordered_multimap/debug/move_neg.cc: Likewise.
	* testsuite/unordered_multimap/erase/1.cc: Likewise.
	* testsuite/unordered_multimap/erase/2.cc: Likewise.
	* testsuite/unordered_multimap/erase/24061-multimap.cc: Likewise.
	* testsuite/unordered_multimap/erase/51845-multimap.cc: Likewise.
	* testsuite/unordered_multimap/erase/54276.cc: Likewise.
	* testsuite/unordered_multimap/hash_policy/dr1189.cc: Likewise.
	* testsuite/unordered_multimap/init-list.cc: Likewise.
	* testsuite/unordered_multimap/insert/24061-multimap.cc: Likewise.
	* testsuite/unordered_multimap/insert/51866.cc: Likewise.
	* testsuite/unordered_multimap/insert/52476.cc: Likewise.
	* testsuite/unordered_multimap/insert/53115.cc: Likewise.
	* testsuite/unordered_multimap/insert/57619.C: Likewise.
	* testsuite/unordered_multimap/insert/hint.cc: Likewise.
	* testsuite/unordered_multimap/insert/multimap_range.cc: Likewise.
	* testsuite/unordered_multimap/insert/multimap_single.cc: Likewise.
	* testsuite/unordered_multimap/insert/multimap_single_move-1.cc:
	Likewise.
	* testsuite/unordered_multimap/insert/multimap_single_move-2.cc:
	Likewise.
	* testsuite/unordered_multimap/modifiers/emplace.cc: Likewise.
	* testsuite/unordered_multimap/modifiers/extract.cc: Likewise.
	* testsuite/unordered_multimap/modifiers/merge.cc: Likewise.
	* testsuite/unordered_multimap/modifiers/reserve.cc: Likewise.
	* testsuite/unordered_multimap/operations/count.cc: Likewise.
	* testsuite/unordered_multimap/operators/1.cc: Likewise.
	* testsuite/unordered_multimap/operators/2.cc: Likewise.
	* testsuite/unordered_multiset/allocator/copy.cc: Likewise.
	* testsuite/unordered_multiset/allocator/copy_assign.cc: Likewise.
	* testsuite/unordered_multiset/allocator/minimal.cc: Likewise.
	* testsuite/unordered_multiset/allocator/move.cc: Likewise.
	* testsuite/unordered_multiset/allocator/move_assign.cc: Likewise.
	* testsuite/unordered_multiset/allocator/swap.cc: Likewise.
	* testsuite/unordered_multiset/cons/copy.cc: Likewise.
	* testsuite/unordered_multiset/cons/moveable.cc: Likewise.
	* testsuite/unordered_multiset/debug/construct5_neg.cc: Likewise.
	* testsuite/unordered_multiset/debug/move_assign_neg.cc: Likewise.
	* testsuite/unordered_multiset/debug/move_neg.cc: Likewise.
	* testsuite/unordered_multiset/erase/1.cc: Likewise.
	* testsuite/unordered_multiset/erase/2.cc: Likewise.
	* testsuite/unordered_multiset/erase/24061-multiset.cc: Likewise.
	* testsuite/unordered_multiset/hash_policy/dr1189.cc: Likewise.
	* testsuite/unordered_multiset/init-list.cc: Likewise.
	* testsuite/unordered_multiset/insert/24061-multiset.cc: Likewise.
	* testsuite/unordered_multiset/insert/51866.cc: Likewise.
	* testsuite/unordered_multiset/insert/52476.cc: Likewise.
	* testsuite/unordered_multiset/insert/53115.cc: Likewise.
	* testsuite/unordered_multiset/insert/hash_policy.cc: Likewise.
	* testsuite/unordered_multiset/insert/multiset_range.cc: Likewise.
	* testsuite/unordered_multiset/insert/multiset_single.cc: Likewise.
	* testsuite/unordered_multiset/insert/multiset_single_move.cc: Likewise.
	* testsuite/unordered_multiset/modifiers/emplace.cc: Likewise.
	* testsuite/unordered_multiset/modifiers/extract.cc: Likewise.
	* testsuite/unordered_multiset/modifiers/merge.cc: Likewise.
	* testsuite/unordered_multiset/modifiers/reserve.cc: Likewise.
	* testsuite/unordered_multiset/operations/count.cc: Likewise.
	* testsuite/unordered_multiset/operators/1.cc: Likewise.
	* testsuite/unordered_set/allocator/copy.cc: Likewise.
	* testsuite/unordered_set/allocator/copy_assign.cc: Likewise.
	* testsuite/unordered_set/allocator/ext_ptr.cc: Likewise.
	* testsuite/unordered_set/allocator/minimal.cc: Likewise.
	* testsuite/unordered_set/allocator/move.cc: Likewise.
	* testsuite/unordered_set/allocator/move_assign.cc: Likewise.
	* testsuite/unordered_set/allocator/swap.cc: Likewise.
	* testsuite/unordered_set/buckets/swap.cc: Likewise.
	* testsuite/unordered_set/cons/moveable.cc: Likewise.
	* testsuite/unordered_set/debug/construct5_neg.cc: Likewise.
	* testsuite/unordered_set/debug/debug_functions.cc: Likewise.
	* testsuite/unordered_set/debug/move_assign_neg.cc: Likewise.
	* testsuite/unordered_set/debug/move_neg.cc: Likewise.
	* testsuite/unordered_set/erase/1.cc: Likewise.
	* testsuite/unordered_set/erase/24061-set.cc: Likewise.
	* testsuite/unordered_set/hash_policy/26132.cc: Likewise.
	* testsuite/unordered_set/hash_policy/71181.cc: Likewise.
	* testsuite/unordered_set/hash_policy/dr1189.cc: Likewise.
	* testsuite/unordered_set/hash_policy/load_factor.cc: Likewise.
	* testsuite/unordered_set/hash_policy/power2_rehash.cc: Likewise.
	* testsuite/unordered_set/hash_policy/prime_rehash.cc: Likewise.
	* testsuite/unordered_set/hash_policy/rehash.cc: Likewise.
	* testsuite/unordered_set/init-list.cc: Likewise.
	* testsuite/unordered_set/insert/24061-set.cc: Likewise.
	* testsuite/unordered_set/insert/hash_policy.cc: Likewise.
	* testsuite/unordered_set/insert/move_range.cc: Likewise.
	* testsuite/unordered_set/insert/set_range.cc: Likewise.
	* testsuite/unordered_set/insert/set_single.cc: Likewise.
	* testsuite/unordered_set/insert/set_single_move.cc: Likewise.
	* testsuite/unordered_set/max_load_factor/robustness.cc: Likewise.
	* testsuite/unordered_set/modifiers/emplace.cc: Likewise.
	* testsuite/unordered_set/modifiers/extract.cc: Likewise.
	* testsuite/unordered_set/modifiers/merge.cc: Likewise.
	* testsuite/unordered_set/modifiers/reserve.cc: Likewise.
	* testsuite/unordered_set/modifiers/swap.cc: Likewise.
	* testsuite/unordered_set/operations/count.cc: Likewise.
	* testsuite/unordered_set/operators/1.cc: Likewise.
	* testsuite/vector/allocator/copy.cc: Likewise.
	* testsuite/vector/allocator/copy_assign.cc: Likewise.
	* testsuite/vector/allocator/ext_ptr.cc: Likewise.
	* testsuite/vector/allocator/minimal.cc: Likewise.
	* testsuite/vector/allocator/move.cc: Likewise.
	* testsuite/vector/allocator/move_assign.cc: Likewise.
	* testsuite/vector/allocator/swap.cc: Likewise.
	* testsuite/vector/bool/6886.cc: Likewise.
	* testsuite/vector/bool/72847.cc: Likewise.
	* testsuite/vector/bool/allocator/copy.cc: Likewise.
	* testsuite/vector/bool/allocator/copy_assign.cc: Likewise.
	* testsuite/vector/bool/allocator/ext_ptr.cc: Likewise.
	* testsuite/vector/bool/allocator/move.cc: Likewise.
	* testsuite/vector/bool/allocator/move_assign.cc: Likewise.
	* testsuite/vector/bool/allocator/swap.cc: Likewise.
	* testsuite/vector/bool/capacity/1.cc: Likewise.
	* testsuite/vector/bool/capacity/29134.cc: Likewise.
	* testsuite/vector/bool/capacity/shrink_to_fit.cc: Likewise.
	* testsuite/vector/bool/cons/1.cc: Likewise.
	* testsuite/vector/bool/cons/2.cc: Likewise.
	* testsuite/vector/bool/modifiers/erase/1.cc: Likewise.
	* testsuite/vector/bool/modifiers/insert/1.cc: Likewise.
	* testsuite/vector/bool/modifiers/insert/31370.cc: Likewise.
	* testsuite/vector/bool/modifiers/swap/1.cc: Likewise.
	* testsuite/vector/bool/modifiers/swap/2.cc: Likewise.
	* testsuite/vector/bool/swap.cc: Likewise.
	* testsuite/vector/capacity/1.cc: Likewise.
	* testsuite/vector/capacity/2.cc: Likewise.
	* testsuite/vector/capacity/29134-2.cc: Likewise.
	* testsuite/vector/capacity/29134.cc: Likewise.
	* testsuite/vector/capacity/44190.cc: Likewise.
	* testsuite/vector/capacity/8230.cc: Likewise.
	* testsuite/vector/capacity/reserve/moveable.cc: Likewise.
	* testsuite/vector/capacity/reserve/moveable2.cc: Likewise.
	* testsuite/vector/capacity/resize/1.cc: Likewise.
	* testsuite/vector/capacity/resize/moveable.cc: Likewise.
	* testsuite/vector/capacity/resize/moveable2.cc: Likewise.
	* testsuite/vector/capacity/resize/resize_size.cc: Likewise.
	* testsuite/vector/capacity/shrink_to_fit.cc: Likewise.
	* testsuite/vector/capacity/shrink_to_fit2.cc: Likewise.
	* testsuite/vector/cons/3.cc: Likewise.
	* testsuite/vector/cons/4.cc: Likewise.
	* testsuite/vector/cons/cons_size.cc: Likewise.
	* testsuite/vector/cons/moveable.cc: Likewise.
	* testsuite/vector/data_access/1.cc: Likewise.
	* testsuite/vector/debug/debug_functions.cc: Likewise.
	* testsuite/vector/debug/move_assign_neg.cc: Likewise.
	* testsuite/vector/debug/move_neg.cc: Likewise.
	* testsuite/vector/debug/multithreaded_swap.cc: Likewise.
	* testsuite/vector/element_access/1.cc: Likewise.
	* testsuite/vector/ext_pointer/citerators.cc: Likewise.
	* testsuite/vector/ext_pointer/data_access.cc: Likewise.
	* testsuite/vector/ext_pointer/modifiers/element.cc: Likewise.
	* testsuite/vector/ext_pointer/modifiers/erase.cc: Likewise.
	* testsuite/vector/ext_pointer/modifiers/insert.cc: Likewise.
	* testsuite/vector/ext_pointer/resize.cc: Likewise.
	* testsuite/vector/modifiers/1.cc: Likewise.
	* testsuite/vector/modifiers/2.cc: Likewise.
	* testsuite/vector/modifiers/emplace/self_emplace.cc: Likewise.
	* testsuite/vector/modifiers/erase/1.cc: Likewise.
	* testsuite/vector/modifiers/erase/moveable.cc: Likewise.
	* testsuite/vector/modifiers/insert/1.cc: Likewise.
	* testsuite/vector/modifiers/insert/self_insert.cc: Likewise.
	* testsuite/vector/modifiers/moveable.cc: Likewise.
	* testsuite/vector/modifiers/moveable2.cc: Likewise.
	* testsuite/vector/modifiers/push_back/49836.cc: Likewise.
	* testsuite/vector/modifiers/swap/1.cc: Likewise.
	* testsuite/vector/modifiers/swap/2.cc: Likewise.
	* testsuite/vector/modifiers/swap/3.cc: Likewise.
	* testsuite/vector/zero_sized_allocations.cc: Likewise.

From-SVN: r241241

477 files changed, 524 insertions, 1052 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 31280a3..98872fd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,489 @@
+2016-10-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* testsuite/unordered_map/insert/57619.C: Rename to 57619.cc.
+	* testsuite/23_containers/unordered_multimap/insert/57619.C: Likewise.
+
+2016-10-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* testsuite/array/capacity/empty.cc: Remove 'test' variables.
+	* testsuite/array/capacity/max_size.cc: Likewise.
+	* testsuite/array/capacity/size.cc: Likewise.
+	* testsuite/array/comparison_operators/equal.cc: Likewise.
+	* testsuite/array/comparison_operators/greater.cc: Likewise.
+	* testsuite/array/comparison_operators/greater_or_equal.cc: Likewise.
+	* testsuite/array/comparison_operators/less.cc: Likewise.
+	* testsuite/array/comparison_operators/less_or_equal.cc: Likewise.
+	* testsuite/array/comparison_operators/not_equal.cc: Likewise.
+	* testsuite/array/element_access/54388.cc: Likewise.
+	* testsuite/array/element_access/at_out_of_range.cc: Likewise.
+	* testsuite/array/element_access/back.cc: Likewise.
+	* testsuite/array/element_access/data.cc: Likewise.
+	* testsuite/array/element_access/front.cc: Likewise.
+	* testsuite/array/iterators/end_is_one_past.cc: Likewise.
+	* testsuite/array/requirements/contiguous.cc: Likewise.
+	* testsuite/array/requirements/fill.cc: Likewise.
+	* testsuite/array/requirements/member_swap.cc: Likewise.
+	* testsuite/array/requirements/zero_sized_arrays.cc: Likewise.
+	* testsuite/array/specialized_algorithms/swap.cc: Likewise.
+	* testsuite/array/tuple_interface/tuple_element.cc: Likewise.
+	* testsuite/array/tuple_interface/tuple_element_cpp14.cc: Likewise.
+	* testsuite/array/tuple_interface/tuple_size.cc: Likewise.
+	* testsuite/bitset/all/1.cc: Likewise.
+	* testsuite/bitset/cons/1.cc: Likewise.
+	* testsuite/bitset/cons/16020.cc: Likewise.
+	* testsuite/bitset/cons/2.cc: Likewise.
+	* testsuite/bitset/cons/3.cc: Likewise.
+	* testsuite/bitset/cons/50268.cc: Likewise.
+	* testsuite/bitset/cons/6282.cc: Likewise.
+	* testsuite/bitset/cons/dr1325-2.cc: Likewise.
+	* testsuite/bitset/cons/dr396.cc: Likewise.
+	* testsuite/bitset/ext/15361.cc: Likewise.
+	* testsuite/bitset/input/1.cc: Likewise.
+	* testsuite/bitset/operations/1.cc: Likewise.
+	* testsuite/bitset/operations/13838.cc: Likewise.
+	* testsuite/bitset/operations/2.cc: Likewise.
+	* testsuite/bitset/test/1.cc: Likewise.
+	* testsuite/bitset/to_string/1.cc: Likewise.
+	* testsuite/bitset/to_string/dr396.cc: Likewise.
+	* testsuite/bitset/to_ullong/1.cc: Likewise.
+	* testsuite/bitset/to_ulong/1.cc: Likewise.
+	* testsuite/deque/allocator/copy.cc: Likewise.
+	* testsuite/deque/allocator/copy_assign.cc: Likewise.
+	* testsuite/deque/allocator/ext_ptr.cc: Likewise.
+	* testsuite/deque/allocator/minimal.cc: Likewise.
+	* testsuite/deque/allocator/move.cc: Likewise.
+	* testsuite/deque/allocator/move_assign.cc: Likewise.
+	* testsuite/deque/allocator/swap.cc: Likewise.
+	* testsuite/deque/capacity/29134-2.cc: Likewise.
+	* testsuite/deque/capacity/29134.cc: Likewise.
+	* testsuite/deque/capacity/moveable.cc: Likewise.
+	* testsuite/deque/capacity/resize_size.cc: Likewise.
+	* testsuite/deque/capacity/shrink_to_fit.cc: Likewise.
+	* testsuite/deque/cons/1.cc: Likewise.
+	* testsuite/deque/cons/2.cc: Likewise.
+	* testsuite/deque/cons/assign/1.cc: Likewise.
+	* testsuite/deque/cons/cons_size.cc: Likewise.
+	* testsuite/deque/cons/moveable.cc: Likewise.
+	* testsuite/deque/modifiers/erase/1.cc: Likewise.
+	* testsuite/deque/modifiers/erase/2.cc: Likewise.
+	* testsuite/deque/modifiers/erase/3.cc: Likewise.
+	* testsuite/deque/modifiers/erase/moveable.cc: Likewise.
+	* testsuite/deque/modifiers/moveable.cc: Likewise.
+	* testsuite/deque/modifiers/push_back/49836.cc: Likewise.
+	* testsuite/deque/modifiers/push_front/49836.cc: Likewise.
+	* testsuite/deque/modifiers/swap/1.cc: Likewise.
+	* testsuite/deque/modifiers/swap/2.cc: Likewise.
+	* testsuite/deque/modifiers/swap/3.cc: Likewise.
+	* testsuite/deque/operators/1.cc: Likewise.
+	* testsuite/deque/operators/2.cc: Likewise.
+	* testsuite/forward_list/allocator/copy.cc: Likewise.
+	* testsuite/forward_list/allocator/copy_assign.cc: Likewise.
+	* testsuite/forward_list/allocator/ext_ptr.cc: Likewise.
+	* testsuite/forward_list/allocator/minimal.cc: Likewise.
+	* testsuite/forward_list/allocator/move.cc: Likewise.
+	* testsuite/forward_list/allocator/move_assign.cc: Likewise.
+	* testsuite/forward_list/allocator/swap.cc: Likewise.
+	* testsuite/forward_list/capacity/1.cc: Likewise.
+	* testsuite/forward_list/capacity/resize_size.cc: Likewise.
+	* testsuite/forward_list/comparable.cc: Likewise.
+	* testsuite/forward_list/cons/1.cc: Likewise.
+	* testsuite/forward_list/cons/2.cc: Likewise.
+	* testsuite/forward_list/cons/3.cc: Likewise.
+	* testsuite/forward_list/cons/4.cc: Likewise.
+	* testsuite/forward_list/cons/5.cc: Likewise.
+	* testsuite/forward_list/cons/6.cc: Likewise.
+	* testsuite/forward_list/cons/7.cc: Likewise.
+	* testsuite/forward_list/cons/8.cc: Likewise.
+	* testsuite/forward_list/cons/9.cc: Likewise.
+	* testsuite/forward_list/cons/cons_size.cc: Likewise.
+	* testsuite/forward_list/cons/moveable.cc: Likewise.
+	* testsuite/forward_list/debug/clear.cc: Likewise.
+	* testsuite/forward_list/debug/construct4_neg.cc: Likewise.
+	* testsuite/forward_list/debug/erase_after1_neg.cc: Likewise.
+	* testsuite/forward_list/debug/move_assign_neg.cc: Likewise.
+	* testsuite/forward_list/debug/move_constructor.cc: Likewise.
+	* testsuite/forward_list/debug/move_neg.cc: Likewise.
+	* testsuite/forward_list/debug/splice_after.cc: Likewise.
+	* testsuite/forward_list/debug/swap.cc: Likewise.
+	* testsuite/forward_list/modifiers/1.cc: Likewise.
+	* testsuite/forward_list/modifiers/2.cc: Likewise.
+	* testsuite/forward_list/modifiers/3.cc: Likewise.
+	* testsuite/forward_list/modifiers/4.cc: Likewise.
+	* testsuite/forward_list/modifiers/5.cc: Likewise.
+	* testsuite/forward_list/modifiers/6.cc: Likewise.
+	* testsuite/forward_list/operations/1.cc: Likewise.
+	* testsuite/forward_list/operations/2.cc: Likewise.
+	* testsuite/forward_list/operations/3.cc: Likewise.
+	* testsuite/forward_list/operations/4.cc: Likewise.
+	* testsuite/forward_list/operations/5.cc: Likewise.
+	* testsuite/forward_list/operations/6.cc: Likewise.
+	* testsuite/forward_list/operations/7.cc: Likewise.
+	* testsuite/forward_list/operations/remove_freed.cc: Likewise.
+	* testsuite/list/61347.cc: Likewise.
+	* testsuite/list/allocator/copy.cc: Likewise.
+	* testsuite/list/allocator/copy_assign.cc: Likewise.
+	* testsuite/list/allocator/minimal.cc: Likewise.
+	* testsuite/list/allocator/move.cc: Likewise.
+	* testsuite/list/allocator/move_assign.cc: Likewise.
+	* testsuite/list/allocator/swap.cc: Likewise.
+	* testsuite/list/capacity/1.h: Likewise.
+	* testsuite/list/capacity/29134.cc: Likewise.
+	* testsuite/list/capacity/resize_size.cc: Likewise.
+	* testsuite/list/cons/1.h: Likewise.
+	* testsuite/list/cons/2.h: Likewise.
+	* testsuite/list/cons/3.h: Likewise.
+	* testsuite/list/cons/4.h: Likewise.
+	* testsuite/list/cons/5.h: Likewise.
+	* testsuite/list/cons/6.h: Likewise.
+	* testsuite/list/cons/7.h: Likewise.
+	* testsuite/list/cons/8.h: Likewise.
+	* testsuite/list/cons/9.h: Likewise.
+	* testsuite/list/cons/cons_size.cc: Likewise.
+	* testsuite/list/cons/moveable.h: Likewise.
+	* testsuite/list/debug/invalidation/1.cc: Likewise.
+	* testsuite/list/debug/invalidation/2.cc: Likewise.
+	* testsuite/list/debug/invalidation/3.cc: Likewise.
+	* testsuite/list/debug/invalidation/4.cc: Likewise.
+	* testsuite/list/modifiers/1.h: Likewise.
+	* testsuite/list/modifiers/2.h: Likewise.
+	* testsuite/list/modifiers/3.h: Likewise.
+	* testsuite/list/modifiers/insert/25288.h: Likewise.
+	* testsuite/list/modifiers/swap/1.h: Likewise.
+	* testsuite/list/modifiers/swap/2.h: Likewise.
+	* testsuite/list/modifiers/swap/3.h: Likewise.
+	* testsuite/list/operations/1.h: Likewise.
+	* testsuite/list/operations/2.h: Likewise.
+	* testsuite/list/operations/3.h: Likewise.
+	* testsuite/list/operations/4.h: Likewise.
+	* testsuite/list/operations/42352.cc: Likewise.
+	* testsuite/map/allocator/copy.cc: Likewise.
+	* testsuite/map/allocator/copy_assign.cc: Likewise.
+	* testsuite/map/allocator/init-list.cc: Likewise.
+	* testsuite/map/allocator/minimal.cc: Likewise.
+	* testsuite/map/allocator/move.cc: Likewise.
+	* testsuite/map/allocator/move_assign.cc: Likewise.
+	* testsuite/map/allocator/swap.cc: Likewise.
+	* testsuite/map/capacity/29134.cc: Likewise.
+	* testsuite/map/cons/moveable.cc: Likewise.
+	* testsuite/map/debug/construct5_neg.cc: Likewise.
+	* testsuite/map/debug/move_assign_neg.cc: Likewise.
+	* testsuite/map/debug/move_neg.cc: Likewise.
+	* testsuite/map/element_access/1.cc: Likewise.
+	* testsuite/map/element_access/2.cc: Likewise.
+	* testsuite/map/element_access/39901.cc: Likewise.
+	* testsuite/map/init-list.cc: Likewise.
+	* testsuite/map/modifiers/dr130.cc: Likewise.
+	* testsuite/map/modifiers/emplace/1.cc: Likewise.
+	* testsuite/map/modifiers/extract.cc: Likewise.
+	* testsuite/map/modifiers/insert/1.cc: Likewise.
+	* testsuite/map/modifiers/insert/16813.cc: Likewise.
+	* testsuite/map/modifiers/insert/2.cc: Likewise.
+	* testsuite/map/modifiers/insert/3.cc: Likewise.
+	* testsuite/map/modifiers/insert/4.cc: Likewise.
+	* testsuite/map/modifiers/insert/5.cc: Likewise.
+	* testsuite/map/modifiers/insert_or_assign/1.cc: Likewise.
+	* testsuite/map/modifiers/merge.cc: Likewise.
+	* testsuite/map/modifiers/swap/1.cc: Likewise.
+	* testsuite/map/modifiers/swap/2.cc: Likewise.
+	* testsuite/map/modifiers/swap/3.cc: Likewise.
+	* testsuite/map/modifiers/try_emplace/1.cc: Likewise.
+	* testsuite/map/operations/1.cc: Likewise.
+	* testsuite/map/operations/count.cc: Likewise.
+	* testsuite/map/operators/1_neg.cc: Likewise.
+	* testsuite/map/operators/2.cc: Likewise.
+	* testsuite/multimap/allocator/copy.cc: Likewise.
+	* testsuite/multimap/allocator/copy_assign.cc: Likewise.
+	* testsuite/multimap/allocator/init-list.cc: Likewise.
+	* testsuite/multimap/allocator/minimal.cc: Likewise.
+	* testsuite/multimap/allocator/move.cc: Likewise.
+	* testsuite/multimap/allocator/move_assign.cc: Likewise.
+	* testsuite/multimap/allocator/swap.cc: Likewise.
+	* testsuite/multimap/capacity/29134.cc: Likewise.
+	* testsuite/multimap/cons/moveable.cc: Likewise.
+	* testsuite/multimap/debug/construct5_neg.cc: Likewise.
+	* testsuite/multimap/debug/move_assign_neg.cc: Likewise.
+	* testsuite/multimap/debug/move_neg.cc: Likewise.
+	* testsuite/multimap/init-list.cc: Likewise.
+	* testsuite/multimap/modifiers/dr130.cc: Likewise.
+	* testsuite/multimap/modifiers/emplace/1.cc: Likewise.
+	* testsuite/multimap/modifiers/extract.cc: Likewise.
+	* testsuite/multimap/modifiers/insert/1.cc: Likewise.
+	* testsuite/multimap/modifiers/insert/2.cc: Likewise.
+	* testsuite/multimap/modifiers/insert/22102.cc: Likewise.
+	* testsuite/multimap/modifiers/insert/3.cc: Likewise.
+	* testsuite/multimap/modifiers/insert/4.cc: Likewise.
+	* testsuite/multimap/modifiers/merge.cc: Likewise.
+	* testsuite/multimap/modifiers/swap/1.cc: Likewise.
+	* testsuite/multimap/modifiers/swap/2.cc: Likewise.
+	* testsuite/multimap/modifiers/swap/3.cc: Likewise.
+	* testsuite/multimap/operations/1.cc: Likewise.
+	* testsuite/multimap/operations/count.cc: Likewise.
+	* testsuite/multiset/allocator/copy.cc: Likewise.
+	* testsuite/multiset/allocator/copy_assign.cc: Likewise.
+	* testsuite/multiset/allocator/init-list.cc: Likewise.
+	* testsuite/multiset/allocator/minimal.cc: Likewise.
+	* testsuite/multiset/allocator/move.cc: Likewise.
+	* testsuite/multiset/allocator/move_assign.cc: Likewise.
+	* testsuite/multiset/allocator/swap.cc: Likewise.
+	* testsuite/multiset/capacity/29134.cc: Likewise.
+	* testsuite/multiset/cons/moveable.cc: Likewise.
+	* testsuite/multiset/debug/construct5_neg.cc: Likewise.
+	* testsuite/multiset/debug/invalidation/2.cc: Likewise.
+	* testsuite/multiset/debug/move_assign_neg.cc: Likewise.
+	* testsuite/multiset/debug/move_neg.cc: Likewise.
+	* testsuite/multiset/init-list.cc: Likewise.
+	* testsuite/multiset/modifiers/dr130.cc: Likewise.
+	* testsuite/multiset/modifiers/emplace/1.cc: Likewise.
+	* testsuite/multiset/modifiers/extract.cc: Likewise.
+	* testsuite/multiset/modifiers/insert/1.cc: Likewise.
+	* testsuite/multiset/modifiers/insert/2.cc: Likewise.
+	* testsuite/multiset/modifiers/insert/22102.cc: Likewise.
+	* testsuite/multiset/modifiers/insert/3.cc: Likewise.
+	* testsuite/multiset/modifiers/insert/4.cc: Likewise.
+	* testsuite/multiset/modifiers/merge.cc: Likewise.
+	* testsuite/multiset/modifiers/swap/1.cc: Likewise.
+	* testsuite/multiset/modifiers/swap/2.cc: Likewise.
+	* testsuite/multiset/modifiers/swap/3.cc: Likewise.
+	* testsuite/multiset/operations/1.cc: Likewise.
+	* testsuite/multiset/operations/count.cc: Likewise.
+	* testsuite/priority_queue/moveable.cc: Likewise.
+	* testsuite/queue/moveable.cc: Likewise.
+	* testsuite/set/allocator/copy.cc: Likewise.
+	* testsuite/set/allocator/copy_assign.cc: Likewise.
+	* testsuite/set/allocator/init-list.cc: Likewise.
+	* testsuite/set/allocator/minimal.cc: Likewise.
+	* testsuite/set/allocator/move.cc: Likewise.
+	* testsuite/set/allocator/move_assign.cc: Likewise.
+	* testsuite/set/allocator/swap.cc: Likewise.
+	* testsuite/set/capacity/29134.cc: Likewise.
+	* testsuite/set/cons/moveable.cc: Likewise.
+	* testsuite/set/debug/construct5_neg.cc: Likewise.
+	* testsuite/set/debug/invalidation/2.cc: Likewise.
+	* testsuite/set/debug/move_assign_neg.cc: Likewise.
+	* testsuite/set/debug/move_neg.cc: Likewise.
+	* testsuite/set/init-list.cc: Likewise.
+	* testsuite/set/modifiers/17948.cc: Likewise.
+	* testsuite/set/modifiers/dr130.cc: Likewise.
+	* testsuite/set/modifiers/emplace/1.cc: Likewise.
+	* testsuite/set/modifiers/extract.cc: Likewise.
+	* testsuite/set/modifiers/insert/1.cc: Likewise.
+	* testsuite/set/modifiers/insert/2.cc: Likewise.
+	* testsuite/set/modifiers/insert/3.cc: Likewise.
+	* testsuite/set/modifiers/merge.cc: Likewise.
+	* testsuite/set/modifiers/swap/1.cc: Likewise.
+	* testsuite/set/modifiers/swap/2.cc: Likewise.
+	* testsuite/set/modifiers/swap/3.cc: Likewise.
+	* testsuite/set/operations/1.cc: Likewise.
+	* testsuite/set/operations/count.cc: Likewise.
+	* testsuite/set/operators/1_neg.cc: Likewise.
+	* testsuite/unordered_map/allocator/copy.cc: Likewise.
+	* testsuite/unordered_map/allocator/copy_assign.cc: Likewise.
+	* testsuite/unordered_map/allocator/minimal.cc: Likewise.
+	* testsuite/unordered_map/allocator/move.cc: Likewise.
+	* testsuite/unordered_map/allocator/move_assign.cc: Likewise.
+	* testsuite/unordered_map/allocator/swap.cc: Likewise.
+	* testsuite/unordered_map/cons/moveable.cc: Likewise.
+	* testsuite/unordered_map/debug/construct5_neg.cc: Likewise.
+	* testsuite/unordered_map/debug/move_assign_neg.cc: Likewise.
+	* testsuite/unordered_map/debug/move_neg.cc: Likewise.
+	* testsuite/unordered_map/dr761.cc: Likewise.
+	* testsuite/unordered_map/erase/1.cc: Likewise.
+	* testsuite/unordered_map/erase/24061-map.cc: Likewise.
+	* testsuite/unordered_map/erase/54276.cc: Likewise.
+	* testsuite/unordered_map/hash_policy/dr1189.cc: Likewise.
+	* testsuite/unordered_map/init-list.cc: Likewise.
+	* testsuite/unordered_map/insert/24061-map.cc: Likewise.
+	* testsuite/unordered_map/insert/57619.C: Likewise.
+	* testsuite/unordered_map/insert/array_syntax.cc: Likewise.
+	* testsuite/unordered_map/insert/array_syntax_move.cc: Likewise.
+	* testsuite/unordered_map/insert/map_range.cc: Likewise.
+	* testsuite/unordered_map/insert/map_single.cc: Likewise.
+	* testsuite/unordered_map/insert/map_single_move-1.cc: Likewise.
+	* testsuite/unordered_map/insert/map_single_move-2.cc: Likewise.
+	* testsuite/unordered_map/modifiers/61667.cc: Likewise.
+	* testsuite/unordered_map/modifiers/emplace.cc: Likewise.
+	* testsuite/unordered_map/modifiers/extract.cc: Likewise.
+	* testsuite/unordered_map/modifiers/insert_or_assign.cc: Likewise.
+	* testsuite/unordered_map/modifiers/merge.cc: Likewise.
+	* testsuite/unordered_map/modifiers/reserve.cc: Likewise.
+	* testsuite/unordered_map/modifiers/try_emplace.cc: Likewise.
+	* testsuite/unordered_map/operations/count.cc: Likewise.
+	* testsuite/unordered_map/operators/1.cc: Likewise.
+	* testsuite/unordered_map/operators/2.cc: Likewise.
+	* testsuite/unordered_multimap/allocator/copy.cc: Likewise.
+	* testsuite/unordered_multimap/allocator/copy_assign.cc: Likewise.
+	* testsuite/unordered_multimap/allocator/minimal.cc: Likewise.
+	* testsuite/unordered_multimap/allocator/move.cc: Likewise.
+	* testsuite/unordered_multimap/allocator/move_assign.cc: Likewise.
+	* testsuite/unordered_multimap/allocator/swap.cc: Likewise.
+	* testsuite/unordered_multimap/cons/moveable.cc: Likewise.
+	* testsuite/unordered_multimap/debug/construct5_neg.cc: Likewise.
+	* testsuite/unordered_multimap/debug/move_assign_neg.cc: Likewise.
+	* testsuite/unordered_multimap/debug/move_neg.cc: Likewise.
+	* testsuite/unordered_multimap/erase/1.cc: Likewise.
+	* testsuite/unordered_multimap/erase/2.cc: Likewise.
+	* testsuite/unordered_multimap/erase/24061-multimap.cc: Likewise.
+	* testsuite/unordered_multimap/erase/51845-multimap.cc: Likewise.
+	* testsuite/unordered_multimap/erase/54276.cc: Likewise.
+	* testsuite/unordered_multimap/hash_policy/dr1189.cc: Likewise.
+	* testsuite/unordered_multimap/init-list.cc: Likewise.
+	* testsuite/unordered_multimap/insert/24061-multimap.cc: Likewise.
+	* testsuite/unordered_multimap/insert/51866.cc: Likewise.
+	* testsuite/unordered_multimap/insert/52476.cc: Likewise.
+	* testsuite/unordered_multimap/insert/53115.cc: Likewise.
+	* testsuite/unordered_multimap/insert/57619.C: Likewise.
+	* testsuite/unordered_multimap/insert/hint.cc: Likewise.
+	* testsuite/unordered_multimap/insert/multimap_range.cc: Likewise.
+	* testsuite/unordered_multimap/insert/multimap_single.cc: Likewise.
+	* testsuite/unordered_multimap/insert/multimap_single_move-1.cc:
+	Likewise.
+	* testsuite/unordered_multimap/insert/multimap_single_move-2.cc:
+	Likewise.
+	* testsuite/unordered_multimap/modifiers/emplace.cc: Likewise.
+	* testsuite/unordered_multimap/modifiers/extract.cc: Likewise.
+	* testsuite/unordered_multimap/modifiers/merge.cc: Likewise.
+	* testsuite/unordered_multimap/modifiers/reserve.cc: Likewise.
+	* testsuite/unordered_multimap/operations/count.cc: Likewise.
+	* testsuite/unordered_multimap/operators/1.cc: Likewise.
+	* testsuite/unordered_multimap/operators/2.cc: Likewise.
+	* testsuite/unordered_multiset/allocator/copy.cc: Likewise.
+	* testsuite/unordered_multiset/allocator/copy_assign.cc: Likewise.
+	* testsuite/unordered_multiset/allocator/minimal.cc: Likewise.
+	* testsuite/unordered_multiset/allocator/move.cc: Likewise.
+	* testsuite/unordered_multiset/allocator/move_assign.cc: Likewise.
+	* testsuite/unordered_multiset/allocator/swap.cc: Likewise.
+	* testsuite/unordered_multiset/cons/copy.cc: Likewise.
+	* testsuite/unordered_multiset/cons/moveable.cc: Likewise.
+	* testsuite/unordered_multiset/debug/construct5_neg.cc: Likewise.
+	* testsuite/unordered_multiset/debug/move_assign_neg.cc: Likewise.
+	* testsuite/unordered_multiset/debug/move_neg.cc: Likewise.
+	* testsuite/unordered_multiset/erase/1.cc: Likewise.
+	* testsuite/unordered_multiset/erase/2.cc: Likewise.
+	* testsuite/unordered_multiset/erase/24061-multiset.cc: Likewise.
+	* testsuite/unordered_multiset/hash_policy/dr1189.cc: Likewise.
+	* testsuite/unordered_multiset/init-list.cc: Likewise.
+	* testsuite/unordered_multiset/insert/24061-multiset.cc: Likewise.
+	* testsuite/unordered_multiset/insert/51866.cc: Likewise.
+	* testsuite/unordered_multiset/insert/52476.cc: Likewise.
+	* testsuite/unordered_multiset/insert/53115.cc: Likewise.
+	* testsuite/unordered_multiset/insert/hash_policy.cc: Likewise.
+	* testsuite/unordered_multiset/insert/multiset_range.cc: Likewise.
+	* testsuite/unordered_multiset/insert/multiset_single.cc: Likewise.
+	* testsuite/unordered_multiset/insert/multiset_single_move.cc: Likewise.
+	* testsuite/unordered_multiset/modifiers/emplace.cc: Likewise.
+	* testsuite/unordered_multiset/modifiers/extract.cc: Likewise.
+	* testsuite/unordered_multiset/modifiers/merge.cc: Likewise.
+	* testsuite/unordered_multiset/modifiers/reserve.cc: Likewise.
+	* testsuite/unordered_multiset/operations/count.cc: Likewise.
+	* testsuite/unordered_multiset/operators/1.cc: Likewise.
+	* testsuite/unordered_set/allocator/copy.cc: Likewise.
+	* testsuite/unordered_set/allocator/copy_assign.cc: Likewise.
+	* testsuite/unordered_set/allocator/ext_ptr.cc: Likewise.
+	* testsuite/unordered_set/allocator/minimal.cc: Likewise.
+	* testsuite/unordered_set/allocator/move.cc: Likewise.
+	* testsuite/unordered_set/allocator/move_assign.cc: Likewise.
+	* testsuite/unordered_set/allocator/swap.cc: Likewise.
+	* testsuite/unordered_set/buckets/swap.cc: Likewise.
+	* testsuite/unordered_set/cons/moveable.cc: Likewise.
+	* testsuite/unordered_set/debug/construct5_neg.cc: Likewise.
+	* testsuite/unordered_set/debug/debug_functions.cc: Likewise.
+	* testsuite/unordered_set/debug/move_assign_neg.cc: Likewise.
+	* testsuite/unordered_set/debug/move_neg.cc: Likewise.
+	* testsuite/unordered_set/erase/1.cc: Likewise.
+	* testsuite/unordered_set/erase/24061-set.cc: Likewise.
+	* testsuite/unordered_set/hash_policy/26132.cc: Likewise.
+	* testsuite/unordered_set/hash_policy/71181.cc: Likewise.
+	* testsuite/unordered_set/hash_policy/dr1189.cc: Likewise.
+	* testsuite/unordered_set/hash_policy/load_factor.cc: Likewise.
+	* testsuite/unordered_set/hash_policy/power2_rehash.cc: Likewise.
+	* testsuite/unordered_set/hash_policy/prime_rehash.cc: Likewise.
+	* testsuite/unordered_set/hash_policy/rehash.cc: Likewise.
+	* testsuite/unordered_set/init-list.cc: Likewise.
+	* testsuite/unordered_set/insert/24061-set.cc: Likewise.
+	* testsuite/unordered_set/insert/hash_policy.cc: Likewise.
+	* testsuite/unordered_set/insert/move_range.cc: Likewise.
+	* testsuite/unordered_set/insert/set_range.cc: Likewise.
+	* testsuite/unordered_set/insert/set_single.cc: Likewise.
+	* testsuite/unordered_set/insert/set_single_move.cc: Likewise.
+	* testsuite/unordered_set/max_load_factor/robustness.cc: Likewise.
+	* testsuite/unordered_set/modifiers/emplace.cc: Likewise.
+	* testsuite/unordered_set/modifiers/extract.cc: Likewise.
+	* testsuite/unordered_set/modifiers/merge.cc: Likewise.
+	* testsuite/unordered_set/modifiers/reserve.cc: Likewise.
+	* testsuite/unordered_set/modifiers/swap.cc: Likewise.
+	* testsuite/unordered_set/operations/count.cc: Likewise.
+	* testsuite/unordered_set/operators/1.cc: Likewise.
+	* testsuite/vector/allocator/copy.cc: Likewise.
+	* testsuite/vector/allocator/copy_assign.cc: Likewise.
+	* testsuite/vector/allocator/ext_ptr.cc: Likewise.
+	* testsuite/vector/allocator/minimal.cc: Likewise.
+	* testsuite/vector/allocator/move.cc: Likewise.
+	* testsuite/vector/allocator/move_assign.cc: Likewise.
+	* testsuite/vector/allocator/swap.cc: Likewise.
+	* testsuite/vector/bool/6886.cc: Likewise.
+	* testsuite/vector/bool/72847.cc: Likewise.
+	* testsuite/vector/bool/allocator/copy.cc: Likewise.
+	* testsuite/vector/bool/allocator/copy_assign.cc: Likewise.
+	* testsuite/vector/bool/allocator/ext_ptr.cc: Likewise.
+	* testsuite/vector/bool/allocator/move.cc: Likewise.
+	* testsuite/vector/bool/allocator/move_assign.cc: Likewise.
+	* testsuite/vector/bool/allocator/swap.cc: Likewise.
+	* testsuite/vector/bool/capacity/1.cc: Likewise.
+	* testsuite/vector/bool/capacity/29134.cc: Likewise.
+	* testsuite/vector/bool/capacity/shrink_to_fit.cc: Likewise.
+	* testsuite/vector/bool/cons/1.cc: Likewise.
+	* testsuite/vector/bool/cons/2.cc: Likewise.
+	* testsuite/vector/bool/modifiers/erase/1.cc: Likewise.
+	* testsuite/vector/bool/modifiers/insert/1.cc: Likewise.
+	* testsuite/vector/bool/modifiers/insert/31370.cc: Likewise.
+	* testsuite/vector/bool/modifiers/swap/1.cc: Likewise.
+	* testsuite/vector/bool/modifiers/swap/2.cc: Likewise.
+	* testsuite/vector/bool/swap.cc: Likewise.
+	* testsuite/vector/capacity/1.cc: Likewise.
+	* testsuite/vector/capacity/2.cc: Likewise.
+	* testsuite/vector/capacity/29134-2.cc: Likewise.
+	* testsuite/vector/capacity/29134.cc: Likewise.
+	* testsuite/vector/capacity/44190.cc: Likewise.
+	* testsuite/vector/capacity/8230.cc: Likewise.
+	* testsuite/vector/capacity/reserve/moveable.cc: Likewise.
+	* testsuite/vector/capacity/reserve/moveable2.cc: Likewise.
+	* testsuite/vector/capacity/resize/1.cc: Likewise.
+	* testsuite/vector/capacity/resize/moveable.cc: Likewise.
+	* testsuite/vector/capacity/resize/moveable2.cc: Likewise.
+	* testsuite/vector/capacity/resize/resize_size.cc: Likewise.
+	* testsuite/vector/capacity/shrink_to_fit.cc: Likewise.
+	* testsuite/vector/capacity/shrink_to_fit2.cc: Likewise.
+	* testsuite/vector/cons/3.cc: Likewise.
+	* testsuite/vector/cons/4.cc: Likewise.
+	* testsuite/vector/cons/cons_size.cc: Likewise.
+	* testsuite/vector/cons/moveable.cc: Likewise.
+	* testsuite/vector/data_access/1.cc: Likewise.
+	* testsuite/vector/debug/debug_functions.cc: Likewise.
+	* testsuite/vector/debug/move_assign_neg.cc: Likewise.
+	* testsuite/vector/debug/move_neg.cc: Likewise.
+	* testsuite/vector/debug/multithreaded_swap.cc: Likewise.
+	* testsuite/vector/element_access/1.cc: Likewise.
+	* testsuite/vector/ext_pointer/citerators.cc: Likewise.
+	* testsuite/vector/ext_pointer/data_access.cc: Likewise.
+	* testsuite/vector/ext_pointer/modifiers/element.cc: Likewise.
+	* testsuite/vector/ext_pointer/modifiers/erase.cc: Likewise.
+	* testsuite/vector/ext_pointer/modifiers/insert.cc: Likewise.
+	* testsuite/vector/ext_pointer/resize.cc: Likewise.
+	* testsuite/vector/modifiers/1.cc: Likewise.
+	* testsuite/vector/modifiers/2.cc: Likewise.
+	* testsuite/vector/modifiers/emplace/self_emplace.cc: Likewise.
+	* testsuite/vector/modifiers/erase/1.cc: Likewise.
+	* testsuite/vector/modifiers/erase/moveable.cc: Likewise.
+	* testsuite/vector/modifiers/insert/1.cc: Likewise.
+	* testsuite/vector/modifiers/insert/self_insert.cc: Likewise.
+	* testsuite/vector/modifiers/moveable.cc: Likewise.
+	* testsuite/vector/modifiers/moveable2.cc: Likewise.
+	* testsuite/vector/modifiers/push_back/49836.cc: Likewise.
+	* testsuite/vector/modifiers/swap/1.cc: Likewise.
+	* testsuite/vector/modifiers/swap/2.cc: Likewise.
+	* testsuite/vector/modifiers/swap/3.cc: Likewise.
+	* testsuite/vector/zero_sized_allocations.cc: Likewise.
+
 2016-10-17  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/77998
diff --git a/libstdc++-v3/testsuite/23_containers/array/capacity/empty.cc b/libstdc++-v3/testsuite/23_containers/array/capacity/empty.cc
index a248437..5e2238f 100644
--- a/libstdc++-v3/testsuite/23_containers/array/capacity/empty.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/capacity/empty.cc
@@ -24,8 +24,6 @@ void
 test01() 
 {
   {
-    bool test __attribute__((unused)) = true;
-
     const size_t len = 5;
     typedef std::array<int, len> array_type;
     array_type a = { { 0, 1, 2, 3, 4 } };
@@ -34,8 +32,6 @@ test01()
   }
 
   {
-    bool test __attribute__((unused)) = true;
-
     const size_t len = 0;
     typedef std::array<int, len> array_type;
     array_type a;
diff --git a/libstdc++-v3/testsuite/23_containers/array/capacity/max_size.cc b/libstdc++-v3/testsuite/23_containers/array/capacity/max_size.cc
index fdfbb90..76f4fb9 100644
--- a/libstdc++-v3/testsuite/23_containers/array/capacity/max_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/capacity/max_size.cc
@@ -24,8 +24,6 @@ void
 test01() 
 {
   {
-    bool test __attribute__((unused)) = true;
-
     const size_t len = 5;
     typedef std::array<int, len> array_type;
     array_type a = { { 0, 1, 2, 3, 4 } };
@@ -34,8 +32,6 @@ test01()
   }
 
   {
-    bool test __attribute__((unused)) = true;
-
     const size_t len = 0;
     typedef std::array<int, len> array_type;
     array_type a;
diff --git a/libstdc++-v3/testsuite/23_containers/array/capacity/size.cc b/libstdc++-v3/testsuite/23_containers/array/capacity/size.cc
index a070d96..c53e120 100644
--- a/libstdc++-v3/testsuite/23_containers/array/capacity/size.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/capacity/size.cc
@@ -24,8 +24,6 @@ void
 test01() 
 {
   {
-    bool test __attribute__((unused)) = true;
-
     const size_t len = 5;
     typedef std::array<int, len> array_type;
     array_type a = { { 0, 1, 2, 3, 4 } };
@@ -34,8 +32,6 @@ test01()
   }
 
   {
-    bool test __attribute__((unused)) = true;
-
     const size_t len = 0;
     typedef std::array<int, len> array_type;
     array_type a;
diff --git a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/equal.cc b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/equal.cc
index 4df3df9..2337410 100644
--- a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/equal.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/equal.cc
@@ -25,7 +25,6 @@ test01()
 { 
   const size_t len = 5;
   typedef std::array<int, len> array_type;
-  bool test __attribute__((unused)) = true;
   array_type a = { { 0, 1, 2, 3, 4 } };
   array_type b = { { 0, 1, 2, 3, 4 } };
   array_type c = { { 0, 1, 2, 3 } };
diff --git a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/greater.cc b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/greater.cc
index 25d96ed..aec5842 100644
--- a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/greater.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/greater.cc
@@ -25,7 +25,6 @@ test01()
 { 
   const size_t len = 5;
   typedef std::array<int, len> array_type;
-  bool test __attribute__((unused)) = true;
   array_type a = { { 0, 1, 2, 3, 4 } };
   array_type b = { { 0, 1, 2, 3, 4 } };
   array_type c = { { 0, 1, 2, 3, 7 } };
diff --git a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/greater_or_equal.cc b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/greater_or_equal.cc
index e2f3dc2..d76fab6 100644
--- a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/greater_or_equal.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/greater_or_equal.cc
@@ -25,7 +25,6 @@ test01()
 { 
   const size_t len = 5;
   typedef std::array<int, len> array_type;
-  bool test __attribute__((unused)) = true;
   array_type a = { { 0, 1, 2, 3, 4 } };
   array_type b = { { 0, 1, 2, 3, 4 } };
   array_type c = { { 0, 1, 2, 3, 7 } };
diff --git a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/less.cc b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/less.cc
index 9654667..06b973b 100644
--- a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/less.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/less.cc
@@ -25,7 +25,6 @@ test01()
 { 
   const size_t len = 5;
   typedef std::array<int, len> array_type;
-  bool test __attribute__((unused)) = true;
   array_type a = { { 0, 1, 2, 3, 4 } };
   array_type b = { { 0, 1, 2, 3, 4 } };
   array_type c = { { 0, 1, 2, 3, 7 } };
diff --git a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/less_or_equal.cc b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/less_or_equal.cc
index 5075927..7285358 100644
--- a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/less_or_equal.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/less_or_equal.cc
@@ -25,7 +25,6 @@ test01()
 { 
   const size_t len = 5;
   typedef std::array<int, len> array_type;
-  bool test __attribute__((unused)) = true;
   array_type a = { { 0, 1, 2, 3, 4 } };
   array_type b = { { 0, 1, 2, 3, 4 } };
   array_type c = { { 0, 1, 2, 3, 7 } };
diff --git a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/not_equal.cc b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/not_equal.cc
index 874ff0e..b186acc 100644
--- a/libstdc++-v3/testsuite/23_containers/array/comparison_operators/not_equal.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/comparison_operators/not_equal.cc
@@ -25,7 +25,6 @@ test01()
 { 
   const size_t len = 5;
   typedef std::array<int, len> array_type;
-  bool test __attribute__((unused)) = true;
   array_type a = { { 0, 1, 2, 3, 4 } };
   array_type b = { { 0, 1, 2, 3, 4 } };
   array_type c = { { 0, 1, 2, 3 } };
diff --git a/libstdc++-v3/testsuite/23_containers/array/element_access/54388.cc b/libstdc++-v3/testsuite/23_containers/array/element_access/54388.cc
index f8ce419..77c46fe 100644
--- a/libstdc++-v3/testsuite/23_containers/array/element_access/54388.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/element_access/54388.cc
@@ -29,8 +29,6 @@ struct A
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const std::array<A, 1> a;
   const A& aa = a.at(0);
   VERIFY(aa.valid);
diff --git a/libstdc++-v3/testsuite/23_containers/array/element_access/at_out_of_range.cc b/libstdc++-v3/testsuite/23_containers/array/element_access/at_out_of_range.cc
index e85255c..c2dac6f 100644
--- a/libstdc++-v3/testsuite/23_containers/array/element_access/at_out_of_range.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/element_access/at_out_of_range.cc
@@ -24,8 +24,6 @@
 void
 test01() 
 {
-  bool test __attribute__((unused)) = true;
-
   const size_t len = 5;
   typedef std::array<int, len> array_type;
   array_type a = { { 0, 1, 2, 3, 4 } };
diff --git a/libstdc++-v3/testsuite/23_containers/array/element_access/back.cc b/libstdc++-v3/testsuite/23_containers/array/element_access/back.cc
index 457dd9c..d82fd8e 100644
--- a/libstdc++-v3/testsuite/23_containers/array/element_access/back.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/element_access/back.cc
@@ -22,9 +22,7 @@
 
 void
 test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-
+{
   const size_t len = 5;
   typedef std::array<int, len> array_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/array/element_access/data.cc b/libstdc++-v3/testsuite/23_containers/array/element_access/data.cc
index d641313..59ec682 100644
--- a/libstdc++-v3/testsuite/23_containers/array/element_access/data.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/element_access/data.cc
@@ -22,9 +22,7 @@
 
 void
 test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-
+{
   const size_t len = 5;
   typedef std::array<int, len> array_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/array/element_access/front.cc b/libstdc++-v3/testsuite/23_containers/array/element_access/front.cc
index bb7f964..d00d016 100644
--- a/libstdc++-v3/testsuite/23_containers/array/element_access/front.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/element_access/front.cc
@@ -22,9 +22,7 @@
 
 void
 test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-
+{
   const size_t len = 5;
   typedef std::array<int, len> array_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/array/iterators/end_is_one_past.cc b/libstdc++-v3/testsuite/23_containers/array/iterators/end_is_one_past.cc
index a24fc6c..d3eb094 100644
--- a/libstdc++-v3/testsuite/23_containers/array/iterators/end_is_one_past.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/iterators/end_is_one_past.cc
@@ -23,8 +23,6 @@
 void
 test01() 
 {
-  bool test __attribute__((unused)) = true;
-
   const size_t len = 5;
   typedef std::array<int, len> array_type;
   array_type a = { { 0, 1, 2, 3, 4 } };
diff --git a/libstdc++-v3/testsuite/23_containers/array/requirements/contiguous.cc b/libstdc++-v3/testsuite/23_containers/array/requirements/contiguous.cc
index 7292fec..55e8753 100644
--- a/libstdc++-v3/testsuite/23_containers/array/requirements/contiguous.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/requirements/contiguous.cc
@@ -23,8 +23,6 @@
 void
 test01() 
 {
-  bool test __attribute__((unused)) = true;
-
   const size_t len = 5;
   typedef std::array<int, len> array_type;
   array_type a = { { 0, 1, 2, 3, 4 } };
diff --git a/libstdc++-v3/testsuite/23_containers/array/requirements/fill.cc b/libstdc++-v3/testsuite/23_containers/array/requirements/fill.cc
index d11537a..ca0c1c7 100644
--- a/libstdc++-v3/testsuite/23_containers/array/requirements/fill.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/requirements/fill.cc
@@ -24,9 +24,7 @@
 
 // DR 776. Undescribed assign function of std::array.
 void test01()
-{ 
-  bool test __attribute__((unused)) = true;
-
+{
   const size_t len = 3;
   typedef std::array<int, len> array_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/array/requirements/member_swap.cc b/libstdc++-v3/testsuite/23_containers/array/requirements/member_swap.cc
index d7881d1..fd26980 100644
--- a/libstdc++-v3/testsuite/23_containers/array/requirements/member_swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/requirements/member_swap.cc
@@ -22,9 +22,7 @@
 
 void
 test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-
+{
   const size_t len = 5;
   typedef std::array<int, len> array_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/array/requirements/zero_sized_arrays.cc b/libstdc++-v3/testsuite/23_containers/array/requirements/zero_sized_arrays.cc
index 6371e10..5cf3ac4 100644
--- a/libstdc++-v3/testsuite/23_containers/array/requirements/zero_sized_arrays.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/requirements/zero_sized_arrays.cc
@@ -23,8 +23,6 @@
 void
 test01() 
 {
-  bool test __attribute__((unused)) = true;
-
   const size_t len = 0;
   typedef std::array<int, len> array_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/array/specialized_algorithms/swap.cc b/libstdc++-v3/testsuite/23_containers/array/specialized_algorithms/swap.cc
index 9fe5b80..cc17239 100644
--- a/libstdc++-v3/testsuite/23_containers/array/specialized_algorithms/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/specialized_algorithms/swap.cc
@@ -22,9 +22,7 @@
 
 void
 test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-
+{
   const size_t len = 5;
   typedef std::array<int, len> array_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element.cc
index 8f3e7c6..0bc3391 100644
--- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element.cc
@@ -23,8 +23,7 @@
 
 void
 test01() 
-{ 
-  bool test __attribute__((unused)) = true;
+{
   using std::array;
   using std::tuple_element;
   // This relies on the fact that <utility> includes <type_traits>:
diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_cpp14.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_cpp14.cc
index 3e081dc..861c410 100644
--- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_cpp14.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_cpp14.cc
@@ -24,7 +24,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   const size_t len = 3;
diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_size.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_size.cc
index 33ad01c..f79febc 100644
--- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_size.cc
@@ -23,8 +23,7 @@
 
 void
 test01() 
-{ 
-  bool test __attribute__((unused)) = true;
+{
   using std::array;
   using std::tuple_size;
   // This relies on the fact that <utility> includes <type_traits>:
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/all/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/all/1.cc
index c59721b..b987320 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/all/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/all/1.cc
@@ -25,8 +25,6 @@
 // DR 693. std::bitset::all() missing.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::bitset<0> z1;
   VERIFY( z1.all() );
   z1.set();
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/1.cc
index 672935b..2217152 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/cons/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/1.cc
@@ -25,10 +25,8 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-bool test01(void)
+void test01(void)
 {
-  bool test __attribute__((unused)) = true;
-
   // bitset()
   const size_t n1 = 5;
   std::bitset<n1> bit01;
@@ -73,7 +71,6 @@ bool test01(void)
   catch(...) {
     VERIFY( false );
   }
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc
index 1d5b380..470c139 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc
@@ -22,7 +22,6 @@
 void test01()
 {
   using __gnu_debug::bitset;
-  bool test __attribute__((unused)) = true;
 
   bitset<5> b(7);
   bitset<5> c;
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc
index d5cd9a0..5985053 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc
@@ -29,8 +29,6 @@ struct X
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   X x;
   std::string s(x);
   std::bitset<32> b1(static_cast<const char*>(x));
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/3.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/3.cc
index 9825658..c60763e 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/cons/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/3.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const unsigned long long num0 = 0ULL;
   std::bitset<0> bs0(num0);
   VERIFY( bs0.to_ullong() == num0 );
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/50268.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/50268.cc
index f145a84..ee9118d 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/cons/50268.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/50268.cc
@@ -23,8 +23,6 @@
 // libstdc++/50268
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::bitset<1> b1(3ULL);
   VERIFY( b1.count() == 1ULL );
 
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/6282.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/6282.cc
index 052a717..15cdd84 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/cons/6282.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/6282.cc
@@ -26,10 +26,9 @@
 
 // boundary condition:  a zero-sized set
 // libstdc++/6282
-bool test02(void)
+void test02(void)
 {
   using std::char_traits;  using std::allocator;
-  bool test __attribute__((unused)) = true;
 
   std::bitset<0>  z1;
   VERIFY( z1.any() == false );
@@ -53,7 +52,6 @@ bool test02(void)
 
   VERIFY( z1.to_ulong() == 0 );
   VERIFY( (z1.to_string<char,char_traits<char>,allocator<char> >().empty() ));
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc
index 02f648a..3b80d21 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc
@@ -38,7 +38,6 @@ template<std::size_t Nb, typename CharT>
 // DR 1325.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   const char s1[4] = { '0', '1', '0', '1' };
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr396.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/dr396.cc
index cd07a8c..7d44039 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr396.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/dr396.cc
@@ -23,8 +23,6 @@
 // DR 396. what are characters zero and one.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::bitset<4> z1(std::string("bbab"), 0, std::string::npos, 'a', 'b');
   VERIFY( z1.to_string('a', 'b') == "bbab" );
 
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc b/libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc
index e719158..700e339 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc
@@ -22,7 +22,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   bitset<256> b;
   b.set(225);
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/input/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/input/1.cc
index e8531ea..28d1a27 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/input/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/input/1.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   bitset<5>      b5;
   bitset<0>      b0;
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/operations/1.cc
index 631bc32..160ce16 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/operations/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/operations/1.cc
@@ -56,8 +56,9 @@ shift_arrays(size_t shift_step, size_t size) {
 
 template <size_t size>
   bool
-  do_test() {
-    bool test __attribute__((unused)) = true;
+  do_test()
+  {
+    bool test = true;
 
     std::bitset<size> shifted;
     std::bitset<size> correct;
@@ -86,10 +87,8 @@ template <size_t size>
     return test;
   }
 
-bool
+void
 test01() {
-  bool test __attribute__((unused)) = true;
-
   VERIFY( do_test<32>() );
   VERIFY( do_test<48>() );
   VERIFY( do_test<64>() );
@@ -97,7 +96,6 @@ test01() {
   VERIFY( do_test<511>() );
   VERIFY( do_test<513>() );
   VERIFY( do_test<997>() );
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc b/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc
index a8427db..b87297c 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc
@@ -22,7 +22,6 @@
 void test01()
 {
   using __gnu_debug::bitset;
-  bool test __attribute__((unused)) = true;
 
   bitset<4>  b0, b1;
   b0.set(1);
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/2.cc b/libstdc++-v3/testsuite/23_containers/bitset/operations/2.cc
index 16a1161..19978fd 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/operations/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/operations/2.cc
@@ -22,15 +22,12 @@
 #include <bitset>
 #include <testsuite_hooks.h>
 
-bool
+void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::bitset<66>  b;
   b <<= 400;
   VERIFY( b.count() == 0 );
-  return test;
 }
 
 int
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/test/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/test/1.cc
index ee4256b..0637f39 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/test/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/test/1.cc
@@ -27,7 +27,6 @@
 void 
 test01(void)
 {
-  bool test __attribute__((unused)) = true;
   const size_t n1 = 5;
 
   // the other 22 member functions should be in here too...
@@ -42,7 +41,6 @@ test01(void)
   catch(...) {
     VERIFY( false );
   }
-  VERIFY( test );
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc
index 84af293..f2bdbe6 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc
@@ -25,7 +25,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   bitset<5> b5;
   string s0 = b5.to_string<char, char_traits<char>, allocator<char> >();
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc b/libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc
index 9201bc7..fed5564 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc
@@ -26,7 +26,6 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   bitset<5> b5;
   string s0 = b5.to_string<char, char_traits<char>, allocator<char> >('a', 'b');
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_ullong/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/to_ullong/1.cc
index baffa14..51b22cf 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/to_ullong/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/to_ullong/1.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::bitset<0> bs0;
   VERIFY( bs0.to_ullong() == 0 );
 
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_ulong/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/to_ulong/1.cc
index cda9167..7f81299 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/to_ulong/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/to_ulong/1.cc
@@ -26,7 +26,6 @@
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   std::bitset<5>      b;
   std::stringstream   ss("101");
   ss.exceptions(std::ios_base::eofbit);
diff --git a/libstdc++-v3/testsuite/23_containers/deque/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/deque/allocator/copy.cc
index b7ce4d3..69a1eda 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/allocator/copy.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
@@ -38,7 +37,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
@@ -49,7 +47,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/deque/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/deque/allocator/copy_assign.cc
index 001f8a8..09387b1 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/allocator/copy_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
@@ -39,7 +38,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/deque/allocator/ext_ptr.cc b/libstdc++-v3/testsuite/23_containers/deque/allocator/ext_ptr.cc
index a8fd1ba..e1d13fa 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/allocator/ext_ptr.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/allocator/ext_ptr.cc
@@ -30,7 +30,6 @@ template class std::deque<T, CustomPointerAlloc<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef CustomPointerAlloc<T> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v(1);
diff --git a/libstdc++-v3/testsuite/23_containers/deque/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/deque/allocator/minimal.cc
index 709f6dc..9f0ccf4 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/allocator/minimal.cc
@@ -30,7 +30,6 @@ template class std::deque<T, SimpleAllocator<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<T> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::deque<T, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/deque/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/deque/allocator/move.cc
index 668d517..d525d68 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/allocator/move.cc
@@ -27,7 +27,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/deque/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/deque/allocator/move_assign.cc
index f554210..e667b0d 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/allocator/move_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
@@ -39,7 +38,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
@@ -53,7 +51,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/deque/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/deque/allocator/swap.cc
index c891172..2f0a1a0 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/allocator/swap.cc
@@ -45,7 +45,6 @@ operator!=(const propagating_allocator<T, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
@@ -59,7 +58,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::deque<T, alloc_type> test_type;
   test_type v1(1, alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc b/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc
index 3bb7c2a..c598957 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc
@@ -24,7 +24,6 @@
 // libstdc++/29134
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   deque<int> d;
diff --git a/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc b/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc
index c10ef52..1e7a1c8 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc
@@ -23,8 +23,6 @@
 // libstdc++/29134
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::deque<int> d;
 
   VERIFY( d.max_size() == d.get_allocator().max_size() );
diff --git a/libstdc++-v3/testsuite/23_containers/deque/capacity/moveable.cc b/libstdc++-v3/testsuite/23_containers/deque/capacity/moveable.cc
index d940730..320fa4f 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/capacity/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/capacity/moveable.cc
@@ -26,8 +26,6 @@ using namespace __gnu_test;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::deque<copycounter> a;
   copycounter::copycount = 0;
   a.resize(10);
diff --git a/libstdc++-v3/testsuite/23_containers/deque/capacity/resize_size.cc b/libstdc++-v3/testsuite/23_containers/deque/capacity/resize_size.cc
index 0d2eb2a..d1273da 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/capacity/resize_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/capacity/resize_size.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::deque<__gnu_test::NonCopyConstructible> d;
   VERIFY( std::distance(d.begin(), d.end()) == 0 );
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc b/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc
index 3137b70..0f0703e 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc
@@ -25,8 +25,6 @@
 // libstdc++/42573
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int> d(100);
   d.push_back(1);
   d.push_back(1);
diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/1.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/1.cc
index 1248078..73110ed 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/cons/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/cons/1.cc
@@ -27,8 +27,6 @@
 
 typedef std::deque<__gnu_test::object_counter>   gdeque;
 
-bool test __attribute__((unused)) = true;
-
 // see http://gcc.gnu.org/ml/libstdc++/2001-11/msg00139.html
 void
 test01()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/2.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/2.cc
index d94677e..5eacace 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/cons/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/cons/2.cc
@@ -35,8 +35,6 @@ using __gnu_test::destructor;
 
 typedef std::deque<object_counter>   gdeque;
 
-bool test __attribute__((unused)) = true;
-
 // 23.2.1     required types
 //
 // A missing required type will cause a compile failure.
diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/assign/1.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/assign/1.cc
index fb4226e..215af71 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/cons/assign/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/cons/assign/1.cc
@@ -25,7 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   int data3[1000];
diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/cons_size.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/cons_size.cc
index c2d8e63..680c076 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/cons/cons_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/cons/cons_size.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::deque<__gnu_test::NonCopyConstructible> d(1000);
   VERIFY( std::distance(d.begin(), d.end()) == 1000 );
   for(auto it = d.begin(); it != d.end(); ++it)
diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/moveable.cc
index 6779ce1..551a3d9 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/cons/moveable.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::deque<int> a,b;
   a.push_back(1);
   b = std::move(a);
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/1.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/1.cc
index e16f260..20a64f0 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/1.cc
@@ -38,8 +38,6 @@ const unsigned N5 = sizeof(A5) / sizeof(int);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::deque<int>                deque_type;
   typedef deque_type::iterator        iterator_type;
 
@@ -78,8 +76,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::deque<std::deque<int> >   deque_type;
   typedef deque_type::iterator        iterator_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/2.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/2.cc
index c2075f3..a2e4dbf 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/2.cc
@@ -58,8 +58,6 @@ template<typename T>
   void
   test01()
   {
-    bool test __attribute__((unused)) = true;
-    
     typedef std::deque<T>                         deque_type;
     typedef typename deque_type::iterator      iterator_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc
index 912b2fc..07aaee7 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc
@@ -22,7 +22,6 @@
 
 void erase(size_t num_elm, size_t elm_strt, size_t elm_end)
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::copy_tracker;
   using __gnu_test::assignment_operator;
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/moveable.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/moveable.cc
index 9bfd306..695b4e3 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/moveable.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_test;
 
   std::deque<copycounter> a(40);
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/moveable.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/moveable.cc
index 7cee6f0..dd706aa 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/moveable.cc
@@ -28,8 +28,6 @@ using namespace __gnu_test;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::deque<copycounter> a;
   copycounter c(1);
   copycounter::copycount = 0;
@@ -42,8 +40,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::deque<copycounter> a;
   copycounter c(1);
   copycounter::copycount = 0;
@@ -56,8 +52,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   std::deque<copycounter> a(1000);
   copycounter c(1);
   copycounter::copycount = 0;
@@ -73,8 +67,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   copycounter c(1);
   std::deque<copycounter> a(10, c);
   copycounter::copycount = 0;
@@ -100,8 +92,6 @@ test04()
 void
 test05()
 {
-  bool test __attribute__((unused)) = true;
-  
   copycounter c(1);
   std::deque<copycounter> a(10, c);
   copycounter::copycount = 0;
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/push_back/49836.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/push_back/49836.cc
index d40610d..74bbdbf 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/push_back/49836.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/push_back/49836.cc
@@ -24,7 +24,6 @@
 // libstdc++/49836
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::CopyConsOnlyType;
   using __gnu_test::MoveConsOnlyType;
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/push_front/49836.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/push_front/49836.cc
index 44cf03d..8139ce4 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/push_front/49836.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/push_front/49836.cc
@@ -24,7 +24,6 @@
 // libstdc++/49836
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::CopyConsOnlyType;
   using __gnu_test::MoveConsOnlyType;
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/1.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/1.cc
index 6b2bdd3..a873914 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/1.cc
@@ -33,7 +33,6 @@ namespace std
 // Should use deque specialization for swap.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::deque<T> A;
   std::deque<T> B;
   swap_calls = 0;
@@ -44,7 +43,6 @@ void test01()
 // Should use deque specialization for swap.
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   deque<T> A;
   deque<T> B;
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/2.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/2.cc
index c9600cc..f7c2a9e 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/2.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/3.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/3.cc
index aa2e215..e07fc4c 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap/3.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
diff --git a/libstdc++-v3/testsuite/23_containers/deque/operators/1.cc b/libstdc++-v3/testsuite/23_containers/deque/operators/1.cc
index 341421c..b553252 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/operators/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/operators/1.cc
@@ -25,8 +25,6 @@
 // libstdc++/6503
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::deque<int> d(2);       
   typedef std::deque<int>::iterator iter;         
   typedef std::deque<int>::const_iterator constiter;
diff --git a/libstdc++-v3/testsuite/23_containers/deque/operators/2.cc b/libstdc++-v3/testsuite/23_containers/deque/operators/2.cc
index bef3da4..45653a6 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/operators/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/operators/2.cc
@@ -25,8 +25,6 @@
 // libstdc++/7186
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::deque<int> d(2);       
   typedef std::deque<int>::iterator iter;         
   typedef std::deque<int>::const_iterator constiter;
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/copy.cc
index fbf24cd..83e8abe 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/copy.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -39,7 +38,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -51,7 +49,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/copy_assign.cc
index ee39149..30250f9 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/copy_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/ext_ptr.cc b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/ext_ptr.cc
index c164a6a..ddda769 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/ext_ptr.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/ext_ptr.cc
@@ -32,7 +32,6 @@ template class std::forward_list<T, CustomPointerAlloc<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef CustomPointerAlloc<T> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v;
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/minimal.cc
index 3d5ac41..e280fe8 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/minimal.cc
@@ -32,7 +32,6 @@ template class std::forward_list<T, SimpleAllocator<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<T> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::forward_list<T, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/move.cc
index 554c9b0..39ec8ae 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/move.cc
@@ -27,7 +27,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/move_assign.cc
index e4fbbb2..098c702 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/move_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/swap.cc
index 9436438..499433e 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/allocator/swap.cc
@@ -44,7 +44,6 @@ operator!=(const propagating_allocator<T, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -60,7 +59,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::forward_list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc b/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc
index 79b47da..f5edcdc3 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc
@@ -25,8 +25,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::forward_list<double> fld;
   VERIFY(fld.empty() == true);
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/capacity/resize_size.cc b/libstdc++-v3/testsuite/23_containers/forward_list/capacity/resize_size.cc
index 99f30fa..6e3d9bc 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/capacity/resize_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/capacity/resize_size.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::forward_list<__gnu_test::NonCopyConstructible> fl;
   VERIFY( std::distance(fl.begin(), fl.end()) == 0 );
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/comparable.cc b/libstdc++-v3/testsuite/23_containers/forward_list/comparable.cc
index 7e7663b..1c4b3bc 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/comparable.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/comparable.cc
@@ -25,8 +25,6 @@
 #include <forward_list>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 int main()
 {
   std::forward_list<double> a = {0.0, 1.0, 2.0, 3.0, 4.0};
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc
index 7879de8..415e3f8 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc
@@ -20,9 +20,6 @@
 // 23.2.3.n forward_list xxx [lib.forward_list.xxx]
 
 #include <forward_list>
-#include <testsuite_hooks.h>
-
-bool test __attribute__((unused)) = true;
 
 // This test verifies the following:
 //   Default construction
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc
index 1089764..657bdfb 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc
@@ -20,9 +20,6 @@
 // 23.2.3.n forward_list xxx [lib.forward_list.xxx]
 
 #include <forward_list>
-#include <testsuite_hooks.h>
-
-bool test __attribute__((unused)) = true;
 
 // This test verifies the following:
 //   Construction from iterator range
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc
index d862130..a9df8b8 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc
@@ -20,9 +20,6 @@
 // 23.2.3.n forward_list xxx [lib.forward_list.xxx]
 
 #include <forward_list>
-#include <testsuite_hooks.h>
-
-bool test __attribute__((unused)) = true;
 
 // This test verifies the following:
 //   Move construction with allocator
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc
index a3524bb..25287fe 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc
@@ -20,9 +20,6 @@
 // 23.2.3.n forward_list xxx [lib.forward_list.xxx]
 
 #include <forward_list>
-#include <testsuite_hooks.h>
-
-bool test __attribute__((unused)) = true;
 
 // This test verifies the following:
 //   Construction from given number of default item
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc
index 8721444..8f2f1a9 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc
@@ -20,9 +20,6 @@
 // 23.2.3.n forward_list xxx [lib.forward_list.xxx]
 
 #include <forward_list>
-#include <testsuite_hooks.h>
-
-bool test __attribute__((unused)) = true;
 
 // This test verifies the following:
 //   Construction from given number of given item
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc
index cbfea66..7356299 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc
@@ -20,9 +20,6 @@
 // 23.2.3.n forward_list xxx [lib.forward_list.xxx]
 
 #include <forward_list>
-#include <testsuite_hooks.h>
-
-bool test __attribute__((unused)) = true;
 
 // This test verifies the following:
 //   Construction from iterator range
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc
index 430bf90..ba891e6 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc
@@ -20,9 +20,6 @@
 // 23.2.3.n forward_list xxx [lib.forward_list.xxx]
 
 #include <forward_list>
-#include <testsuite_hooks.h>
-
-bool test __attribute__((unused)) = true;
 
 // This test verifies the following:
 //   Copy construction
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc
index 9c8eefb..aa1049d 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc
@@ -20,9 +20,6 @@
 // 23.2.3.n forward_list xxx [lib.forward_list.xxx]
 
 #include <forward_list>
-#include <testsuite_hooks.h>
-
-bool test __attribute__((unused)) = true;
 
 // This test verifies the following:
 //   Move construction
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc
index 99a7a97..e76c8e2 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc
@@ -20,9 +20,6 @@
 // 23.2.3.n forward_list xxx [lib.forward_list.xxx]
 
 #include <forward_list>
-#include <testsuite_hooks.h>
-
-bool test __attribute__((unused)) = true;
 
 // This test verifies the following.
 //   Construction from initializer list
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/cons_size.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/cons_size.cc
index 931534d..b20aced 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/cons_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/cons_size.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::forward_list<__gnu_test::NonCopyConstructible> fl(1000);
   VERIFY( std::distance(fl.begin(), fl.end()) == 1000 );
   for(auto it = fl.begin(); it != fl.end(); ++it)
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/moveable.cc
index 74ee4fb..e28e849 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/cons/moveable.cc
@@ -26,8 +26,6 @@
 #include <utility>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 int main()
 {
   std::forward_list<int> a, b;
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc
index 2b35f39..fde7920 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc
@@ -24,7 +24,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   std::forward_list<int> fl{1, 2, 3};
 
   auto before = fl.before_begin();
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct4_neg.cc
index 3ccd0c0..9f7098e 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/construct4_neg.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::forward_list<int, alloc_type> test_type;
   test_type v1(alloc_type(1));
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 ae90415..51a52ca 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
@@ -24,8 +24,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::forward_list<int> fl1{1, 2, 3};
 
   auto it = fl1.begin();
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_assign_neg.cc
index fd0fbb7..09b52df 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_assign_neg.cc
@@ -22,8 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::propagating_allocator<int, false> alloc_type;
   typedef __gnu_debug::forward_list<int, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc
index 0073b11..b36c752 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc
@@ -24,7 +24,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   std::forward_list<int> fl1{1, 3, 5};
 
   auto flit = fl1.before_begin();
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_neg.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_neg.cc
index 295f203..1795a52 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_neg.cc
@@ -26,8 +26,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef uneq_allocator<int> alloc_type;
   typedef __gnu_debug::forward_list<int, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc
index d5beb0e..20430a9 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc
@@ -24,7 +24,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   std::forward_list<int> fl1{1, 2, 3};
   std::forward_list<int> fl2{4, 5, 6};
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc b/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc
index 9446fce..91698a6 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc
@@ -26,7 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   std::forward_list<int> fl1{1, 3, 5};
   std::forward_list<int> fl2{2, 4, 6};
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc
index 3e31bbc..c0a6c4c 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc
@@ -24,8 +24,6 @@
 
 #include <array>
 
-bool test __attribute__((unused)) = true;
-
 class PathPoint
 {
 public:
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc
index e2d1ce7..a729b8d 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc
@@ -24,8 +24,6 @@
 
 #include <string>
 
-bool test __attribute__((unused)) = true;
-
 // This test verifies the following:
 //   insert_after single item
 //   before_begin iterator
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc
index 498c735..1998c54 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc
@@ -29,8 +29,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::forward_list<int> fl({0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
 
   std::forward_list<int>::const_iterator pos = fl.cbegin();
@@ -52,8 +50,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::forward_list<int> fl({0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
 
   std::forward_list<int>::const_iterator pos = fl.cbegin();
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc
index 3a063244..0459173 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc
@@ -22,8 +22,6 @@
 #include <forward_list>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 // This test verifies the following:
 //   swap
 void
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc
index 13f502c..015583b 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc
@@ -22,8 +22,6 @@
 #include <forward_list>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 // This test verifies the following:
 //   clear
 void
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/6.cc b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/6.cc
index 790d524..5628522 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/6.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/6.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::forward_list<int> fl1(1, 5), fl2(1, 4), fl3(1, 3),
                          fl4(1, 2), fl5(1, 1), fl6(1, 0);
 
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc
index 0d7d24c..6e08f87 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc
@@ -22,8 +22,6 @@
 #include <forward_list>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 // This test verifies the following:
 //   
 void
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc
index 80cbe15..6d4459c 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc
@@ -22,8 +22,6 @@
 #include <forward_list>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 // This test verifies the following:
 //   remove
 void
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc
index b894e7a..f5d62aa 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc
@@ -24,8 +24,6 @@
 
 #include <algorithm>
 
-bool test __attribute__((unused)) = true;
-
 // This test verifies the following:
 //   remove_if
 void
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc
index 6874ba1..19a0441 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc
@@ -22,8 +22,6 @@
 #include <forward_list>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 // This test verifies the following:
 //   unique
 void
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc
index 3d22607..1e456d4 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc
@@ -22,8 +22,6 @@
 #include <forward_list>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 // This test verifies the following:
 //   
 void
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc
index 02931cd..0f75ba2 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc
@@ -22,8 +22,6 @@
 #include <forward_list>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 //  Comparison functor.
 template<typename Num>
   class Comp
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc
index 0bbd973..07b7382 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc
@@ -24,8 +24,6 @@
 
 #include <algorithm>
 
-bool test __attribute__((unused)) = true;
-
 // This test verifies the following:
 //   
 void
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_freed.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_freed.cc
index 3579815..1fa70b5 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_freed.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_freed.cc
@@ -27,8 +27,6 @@
 // Used to cause many Valgrind errors: LWG 526-type situation.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::forward_list<int> fl1;
   
   fl1.push_front(1);
diff --git a/libstdc++-v3/testsuite/23_containers/list/61347.cc b/libstdc++-v3/testsuite/23_containers/list/61347.cc
index 0058923..8551ef5 100644
--- a/libstdc++-v3/testsuite/23_containers/list/61347.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/61347.cc
@@ -41,8 +41,6 @@ void testc(const std::list<short>& l)
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
 #if _GLIBCXX_USE_DUAL_ABI
   std::list<short> l;
   testm(l);
diff --git a/libstdc++-v3/testsuite/23_containers/list/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/list/allocator/copy.cc
index 13d518a..1e29786 100644
--- a/libstdc++-v3/testsuite/23_containers/list/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/allocator/copy.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -39,7 +38,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -51,7 +49,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/list/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/list/allocator/copy_assign.cc
index 7038793..3b4fb8f 100644
--- a/libstdc++-v3/testsuite/23_containers/list/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/allocator/copy_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/list/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/list/allocator/minimal.cc
index 7556fd9..79fc01b 100644
--- a/libstdc++-v3/testsuite/23_containers/list/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/allocator/minimal.cc
@@ -32,7 +32,6 @@ template class std::list<T, SimpleAllocator<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<T> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::list<T, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/list/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/list/allocator/move.cc
index 81bee4e..98c988f 100644
--- a/libstdc++-v3/testsuite/23_containers/list/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/allocator/move.cc
@@ -27,7 +27,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/list/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/list/allocator/move_assign.cc
index e7ca445..5cf0deb 100644
--- a/libstdc++-v3/testsuite/23_containers/list/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/allocator/move_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/list/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/list/allocator/swap.cc
index fa0c9e8..718731f 100644
--- a/libstdc++-v3/testsuite/23_containers/list/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/allocator/swap.cc
@@ -44,7 +44,6 @@ operator!=(const propagating_allocator<T, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -60,7 +59,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::list<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/list/capacity/1.h b/libstdc++-v3/testsuite/23_containers/list/capacity/1.h
index 33e6b0c..9d57563 100644
--- a/libstdc++-v3/testsuite/23_containers/list/capacity/1.h
+++ b/libstdc++-v3/testsuite/23_containers/list/capacity/1.h
@@ -33,7 +33,6 @@ template<typename _Tp>
 void
 capacity01()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
   typedef typename list_type::iterator iterator_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc b/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc
index 54ce84c..8abbeb4 100644
--- a/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc
@@ -23,8 +23,6 @@
 // libstdc++/29134
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::list<int> list_type;
   list_type l;
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/capacity/resize_size.cc b/libstdc++-v3/testsuite/23_containers/list/capacity/resize_size.cc
index 9e9ca57..0636686 100644
--- a/libstdc++-v3/testsuite/23_containers/list/capacity/resize_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/capacity/resize_size.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::list<__gnu_test::NonCopyConstructible> l;
   VERIFY( std::distance(l.begin(), l.end()) == 0 );
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/1.h b/libstdc++-v3/testsuite/23_containers/list/cons/1.h
index d700d92..95b8630 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/1.h
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/1.h
@@ -40,7 +40,6 @@ template<typename _Tp>
 void
 cons01()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
 
   list_type list0101;
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/2.h b/libstdc++-v3/testsuite/23_containers/list/cons/2.h
index 196e613..091385b 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/2.h
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/2.h
@@ -38,7 +38,6 @@ template<typename _Tp>
 void
 cons021()
 {
-  bool test __attribute__((unused)) = true;
   const std::size_t LIST_SIZE = 5;
   const int INIT_VALUE = 7;
   std::size_t count;
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/3.h b/libstdc++-v3/testsuite/23_containers/list/cons/3.h
index b5d810c..40457dd 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/3.h
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/3.h
@@ -32,7 +32,6 @@ template<typename _Tp>
 void
 cons03()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
   typedef typename list_type::iterator iterator;
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/4.h b/libstdc++-v3/testsuite/23_containers/list/cons/4.h
index 2ff6d67..db1cac5 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/4.h
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/4.h
@@ -32,7 +32,6 @@ template<typename _Tp>
 void
 cons04()
 {
-  bool test __attribute__((unused)) = true;
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const std::size_t N = sizeof(A) / sizeof(int);
   std::size_t count;
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/5.h b/libstdc++-v3/testsuite/23_containers/list/cons/5.h
index b1d507d..a88baa5 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/5.h
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/5.h
@@ -31,7 +31,6 @@ template<typename _Tp>
 void
 cons05()
 {
-  bool test __attribute__((unused)) = true;
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const std::size_t N = sizeof(A) / sizeof(int);
   int count;
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/6.h b/libstdc++-v3/testsuite/23_containers/list/cons/6.h
index 54141f7..fef2dea 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/6.h
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/6.h
@@ -31,7 +31,6 @@ template<typename _Tp>
 void
 cons06()
 {
-  bool test __attribute__((unused)) = true;
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const int B[] = {101, 102, 103, 104, 105};
   const std::size_t N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/7.h b/libstdc++-v3/testsuite/23_containers/list/cons/7.h
index e737c7e..b513453 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/7.h
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/7.h
@@ -31,7 +31,6 @@ template<typename _Tp>
 void
 cons07()
 {
-  bool test __attribute__((unused)) = true;
   const std::size_t BIG_LIST_SIZE = 11;
   const int BIG_INIT_VALUE = 7;
   const std::size_t SMALL_LIST_SIZE = 5;
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/8.h b/libstdc++-v3/testsuite/23_containers/list/cons/8.h
index 54964c4..aefd0f6 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/8.h
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/8.h
@@ -34,7 +34,6 @@ cons08()
 {
   typedef _Tp list_type;
   typedef typename list_type::iterator iterator;
-  bool test __attribute__((unused)) = true;
   const std::size_t LIST_SIZE = 5;
   const int INIT_VALUE = 7;
   std::size_t count = 0;
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/9.h b/libstdc++-v3/testsuite/23_containers/list/cons/9.h
index faa4871..a707e75 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/9.h
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/9.h
@@ -32,7 +32,6 @@ template<typename _Tp>
 void
 cons09()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
   typedef typename list_type::iterator iterator;
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/cons_size.cc b/libstdc++-v3/testsuite/23_containers/list/cons/cons_size.cc
index cd1aee0..32eff63 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/cons_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/cons_size.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::list<__gnu_test::NonCopyConstructible> l(1000);
   VERIFY( std::distance(l.begin(), l.end()) == 1000 );
   for(auto it = l.begin(); it != l.end(); ++it)
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/moveable.h b/libstdc++-v3/testsuite/23_containers/list/cons/moveable.h
index 5d0a997..19448e9 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/moveable.h
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/moveable.h
@@ -26,8 +26,6 @@ template<typename _Tp>
   void
   test_moveable()
   {
-    bool test __attribute__((unused)) = true;
-
     typedef _Tp list_type;
     
     list_type a,b;
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/1.cc
index 74c8b7e..932b1a3 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/1.cc
@@ -26,8 +26,6 @@ void test01()
 {
   using std::advance;
 
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_debug::list<int> list_type;
   list_type v1;
   list_type v2;
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/2.cc
index c00c9bd..92dd30a 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/2.cc
@@ -25,9 +25,7 @@
 void test02()
 {
   using std::advance;
-  
-  bool test __attribute__((unused)) = true;
- 
+
   typedef __gnu_debug::list<int> list_type;
 
   list_type v(10, 17);
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/3.cc
index 5c7031a..161e6e2 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/3.cc
@@ -25,8 +25,7 @@
 void test03()
 {
   using std::advance;
-  
-  bool test __attribute__((unused)) = true;
+
   typedef __gnu_debug::list<int> list_type;
 
   list_type v(20, 42);
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/4.cc
index cda7326..b86221d 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/invalidation/4.cc
@@ -25,8 +25,6 @@
 void test04()
 {
   using std::advance;
-  
-  bool test __attribute__((unused)) = true;
 
   typedef __gnu_debug::list<int>  list_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h b/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h
index 21ac2ae..4f0b73a 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h
@@ -26,7 +26,6 @@ template<typename _Tp>
 void
 modifiers1()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
   typedef typename list_type::iterator iterator;
   typedef typename list_type::value_type value_type;
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h b/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h
index fd228a9..85e9b52 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h
@@ -24,7 +24,6 @@ template<typename _Tp>
 void
 modifiers2()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
   typedef typename list_type::value_type value_type;
   typedef typename list_type::iterator iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h b/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h
index 4c1f2a0..a1d62a6 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h
@@ -44,7 +44,6 @@ template<typename _Tp>
 void
 modifiers3()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
   typedef typename list_type::iterator iterator;
   typedef typename list_type::value_type value_type;
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h b/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h
index 780d632..809cd86 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h
@@ -24,8 +24,6 @@
 template<typename _Tp>
 void insert1()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef _Tp list_type;
   typedef typename _Tp::value_type value_type;
   typedef typename _Tp::allocator_type allocator_type;
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/1.h b/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/1.h
index 42edb40..1a85c1c 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/1.h
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/1.h
@@ -27,7 +27,6 @@ template<typename _Tp>
 void 
 swap11()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
 
   list_type A;
@@ -43,7 +42,6 @@ void
 swap12()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
 
   list_type A;
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/2.h b/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/2.h
index 1d67929..5845271 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/2.h
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/2.h
@@ -27,7 +27,6 @@ template<typename _Tp>
 void
 swap2()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef _Tp list_type;
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/3.h b/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/3.h
index bb8c529..a7841f9 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/3.h
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/swap/3.h
@@ -27,7 +27,6 @@ template<typename _Tp>
 void
 swap3()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef _Tp list_type;
diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/1.h b/libstdc++-v3/testsuite/23_containers/list/operations/1.h
index 624bc34..d9d557a 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operations/1.h
+++ b/libstdc++-v3/testsuite/23_containers/list/operations/1.h
@@ -24,7 +24,6 @@ template<typename _Tp>
 void
 operations01()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
   typedef typename list_type::iterator iterator;
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/2.h b/libstdc++-v3/testsuite/23_containers/list/operations/2.h
index 2a9427b..9d4dd6a 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operations/2.h
+++ b/libstdc++-v3/testsuite/23_containers/list/operations/2.h
@@ -24,7 +24,6 @@ template<typename _Tp>
 void
 operations02()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
   typedef typename list_type::iterator iterator;
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/3.h b/libstdc++-v3/testsuite/23_containers/list/operations/3.h
index 2868d72..4bcced5 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operations/3.h
+++ b/libstdc++-v3/testsuite/23_containers/list/operations/3.h
@@ -24,7 +24,6 @@ template<typename _Tp>
 void
 operations03()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
   typedef typename list_type::iterator iterator;
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/4.h b/libstdc++-v3/testsuite/23_containers/list/operations/4.h
index 6a1c344..208c8e2f 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operations/4.h
+++ b/libstdc++-v3/testsuite/23_containers/list/operations/4.h
@@ -49,7 +49,6 @@ template<typename _Tp>
 void
 operations04()
 {
-  bool test __attribute__((unused)) = true;
   typedef _Tp list_type;
 
   const int A[] = {1, 2, 3, 4, 5, 6};
diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc b/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc
index 75862ce..9d7acd4 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc
@@ -23,8 +23,6 @@
 // PR libstdc++/42352
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::list<int> l{3, 2, 4, 1, 5, 9, 0, 8, 6, 7};
 
   l.sort();
@@ -38,8 +36,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::list<int> l{3, 2, 4, 1, 5, 9, 0, 8, 6, 7};
 
   struct compare
diff --git a/libstdc++-v3/testsuite/23_containers/map/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/map/allocator/copy.cc
index 1555e0e..ad174cb 100644
--- a/libstdc++-v3/testsuite/23_containers/map/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/allocator/copy.cc
@@ -33,7 +33,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, false> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, true> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -57,7 +55,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, true> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/map/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/map/allocator/copy_assign.cc
index dbcb1fa..46fc93d 100644
--- a/libstdc++-v3/testsuite/23_containers/map/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/allocator/copy_assign.cc
@@ -33,7 +33,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, false> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -47,7 +46,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, true> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -61,8 +59,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef tracker_allocator<std::pair<const int, int>> alloc_type;
diff --git a/libstdc++-v3/testsuite/23_containers/map/allocator/init-list.cc b/libstdc++-v3/testsuite/23_containers/map/allocator/init-list.cc
index 3b50b30..22a0b19 100644
--- a/libstdc++-v3/testsuite/23_containers/map/allocator/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/allocator/init-list.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef tracker_allocator<std::pair<const int, int>> alloc_type;
diff --git a/libstdc++-v3/testsuite/23_containers/map/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/map/allocator/minimal.cc
index 43045bf..fb86658 100644
--- a/libstdc++-v3/testsuite/23_containers/map/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/allocator/minimal.cc
@@ -36,7 +36,6 @@ template class std::map<T, U, Cmp, SimpleAllocator<std::pair<const T, U>>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<std::pair<const T, U>> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/map/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/map/allocator/move.cc
index 465ce4f..296d7d4 100644
--- a/libstdc++-v3/testsuite/23_containers/map/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/allocator/move.cc
@@ -33,7 +33,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<std::pair<const T, U>> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -49,7 +48,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<std::pair<const T, U>> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/map/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/map/allocator/move_assign.cc
index 421a068..da7bfda 100644
--- a/libstdc++-v3/testsuite/23_containers/map/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/allocator/move_assign.cc
@@ -33,7 +33,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, false> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -49,7 +48,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, true> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -67,8 +65,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef propagating_allocator<std::pair<const int, int>, false,
diff --git a/libstdc++-v3/testsuite/23_containers/map/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/map/allocator/swap.cc
index f83372d..ce136b8 100644
--- a/libstdc++-v3/testsuite/23_containers/map/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/allocator/swap.cc
@@ -50,7 +50,6 @@ operator!=(const propagating_allocator<std::pair<const T, U>, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, false> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -66,7 +65,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, true> alloc_type;
   typedef std::map<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc b/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc
index 52785c0..0d7a82be 100644
--- a/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc
@@ -23,8 +23,6 @@
 // libstdc++/29134
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::map<int, int> m;
 
   VERIFY( (m.max_size() == std::allocator<std::_Rb_tree_node<
diff --git a/libstdc++-v3/testsuite/23_containers/map/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/map/cons/moveable.cc
index 2987974..7918fed 100644
--- a/libstdc++-v3/testsuite/23_containers/map/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/cons/moveable.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::map<int, int> a,b;
   a[2]=0;
   b[1]=0;
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct5_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct5_neg.cc
index 51133c4..9be8c02 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct5_neg.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::uneq_allocator<std::pair<const int, int> > alloc_type;
   typedef __gnu_debug::map<int, int, std::less<int>, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/move_assign_neg.cc
index 86ae0e8..bb79b47 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/move_assign_neg.cc
@@ -22,8 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::propagating_allocator<std::pair<const int, int>,
 					    false> alloc_type;
   typedef __gnu_debug::map<int, int, std::less<int>, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/move_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/move_neg.cc
index aca4d31..f909af5 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/move_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/move_neg.cc
@@ -26,8 +26,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef uneq_allocator<std::pair<const int, int> > alloc_type;
   typedef __gnu_debug::map<int, int, std::less<int>, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/map/element_access/1.cc b/libstdc++-v3/testsuite/23_containers/map/element_access/1.cc
index 0811f36..6a1ec50 100644
--- a/libstdc++-v3/testsuite/23_containers/map/element_access/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/element_access/1.cc
@@ -23,8 +23,7 @@
 
 // libstdc++/23578
 void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
+{
   typedef std::map<int, double> map_type;
 
   {
diff --git a/libstdc++-v3/testsuite/23_containers/map/element_access/2.cc b/libstdc++-v3/testsuite/23_containers/map/element_access/2.cc
index e107379..5762cfe 100644
--- a/libstdc++-v3/testsuite/23_containers/map/element_access/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/element_access/2.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::map<rvalstruct, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/map/element_access/39901.cc b/libstdc++-v3/testsuite/23_containers/map/element_access/39901.cc
index 60680b0..b2a944f 100644
--- a/libstdc++-v3/testsuite/23_containers/map/element_access/39901.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/element_access/39901.cc
@@ -23,8 +23,6 @@
 // c++/39901
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::map<std::pair<int, int>, int> the_map;
 
   the_map[{0, 1}] = 5;
diff --git a/libstdc++-v3/testsuite/23_containers/map/init-list.cc b/libstdc++-v3/testsuite/23_containers/map/init-list.cc
index abe9cbc..2cc93f3 100644
--- a/libstdc++-v3/testsuite/23_containers/map/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/init-list.cc
@@ -23,10 +23,8 @@
 
 using namespace std;
 
-int test01()
+void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   map<int,double> m({ { 1, 1.0 }, { 2, 2.0 }, { 42, 237.0 } });
   VERIFY(m.size() == 3);
   VERIFY(m[1] == 1.0);
@@ -44,7 +42,6 @@ int test01()
   VERIFY(m[6] == 66.0);
   VERIFY(m[7] == 77.0);
   VERIFY(m[8] == 88.0);
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/dr130.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/dr130.cc
index ce46fc8..f48bf89 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/dr130.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/dr130.cc
@@ -25,7 +25,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   map<int, int> m0;
@@ -48,7 +47,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   map<int, int> m0;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/1.cc
index 5738d9c..760090e 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/emplace/1.cc
@@ -37,8 +37,6 @@ private:
   std::vector<double> coords;
 };
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   typedef std::map<char, std::vector<double>> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/extract.cc
index dbbcc80..7622e48 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/extract.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/extract.cc
@@ -26,8 +26,6 @@ using test_type = std::map<int, int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ {1, 10}, {2, 20}, {3, 30} };
   test_type::node_type node;
   test_type::insert_return_type ins;
@@ -101,8 +99,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ {1, 10}, {2, 20}, {3, 30} };
   test_type::node_type node;
   test_type::insert_return_type ins;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/1.cc
index 6db8a86..2bc1b47 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/1.cc
@@ -28,7 +28,6 @@
 // http://gcc.gnu.org/ml/gcc-patches/2001-08/msg01375.html
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::map<int, int>   Map;
   Map             M;
   Map::iterator   hint;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc
index 0f6076a..77f59dd 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc
@@ -22,7 +22,6 @@
 void test01()
 {
   using __gnu_debug::map;
-  bool test __attribute__((unused)) = true;
 
   map<int, float> m1, m2;
 
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/2.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/2.cc
index 99e3daa..807e3f9 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/2.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::map<int, rvalstruct> Map;
@@ -46,7 +45,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::map<int, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/3.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/3.cc
index 1bb5048..b273588 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/3.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::map<rvalstruct, rvalstruct> Map;
@@ -47,7 +46,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::map<rvalstruct, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/4.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/4.cc
index 6c5b994..33a1144 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/4.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::map<int, rvalstruct> Map;
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::map<int, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/5.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/5.cc
index 40b8cad..1c1d3ec 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/5.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/5.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::map<rvalstruct, rvalstruct> Map;
@@ -46,7 +45,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::map<rvalstruct, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc
index 9db533b..bcce8ea 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert_or_assign/1.cc
@@ -21,9 +21,6 @@
 #include <map>
 #include <testsuite_hooks.h>
 
-
-bool test __attribute__((unused)) = true;
-
 struct Val
 {
   bool moved_from_ctor = false;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/merge.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/merge.cc
index c978ed2..cc8da8f 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/merge.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/merge.cc
@@ -26,8 +26,6 @@ using test_type = std::map<int, int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {2, 20}, {3, 30} };
   test_type c1 = c0, c2 = c0;
 
@@ -48,8 +46,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {2, 20}, {3, 30} };
   test_type c1 = c0;
   std::map<int, int, std::less<>> c2( c0.begin(), c0.end() );
@@ -71,8 +67,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {2, 20}, {3, 30} };
   test_type c1 = c0;
   std::map<int, int, std::greater<>> c2( c0.begin(), c0.end() );
@@ -98,8 +92,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {2, 20}, {3, 30} };
   test_type c1 = c0;
   std::multimap<int, int, std::greater<>> c2( c0.begin(), c0.end() );
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/1.cc
index 9bbf2dd..52c4922 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/1.cc
@@ -36,7 +36,6 @@ namespace std
 // Should use map specialization for swap.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::map<T, int> A;
   std::map<T, int> B;
   swap_calls = 0;
@@ -47,7 +46,6 @@ void test01()
 // Should use map specialization for swap.
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   map<T, int> A;
   map<T, int> B;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/2.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/2.cc
index 2f55eef..51b46b5 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/2.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef pair<const char, int> my_pair;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/3.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/3.cc
index 02e5ee8..c3616df 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/3.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef pair<const char, int> my_pair;
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/try_emplace/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/try_emplace/1.cc
index 68665c5..9ea8770 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/try_emplace/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/try_emplace/1.cc
@@ -21,9 +21,6 @@
 #include <map>
 #include <testsuite_hooks.h>
 
-
-bool test __attribute__((unused)) = true;
-
 struct Val
 {
   bool moved_from_ctor = false;
diff --git a/libstdc++-v3/testsuite/23_containers/map/operations/1.cc b/libstdc++-v3/testsuite/23_containers/map/operations/1.cc
index bdb6699..e172fc7 100644
--- a/libstdc++-v3/testsuite/23_containers/map/operations/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/operations/1.cc
@@ -24,7 +24,6 @@
 // A few tests for equal_range, in the occasion of libstdc++/29385.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   map<int, int> m0;
diff --git a/libstdc++-v3/testsuite/23_containers/map/operations/count.cc b/libstdc++-v3/testsuite/23_containers/map/operations/count.cc
index 359fd1b..ef226b6 100644
--- a/libstdc++-v3/testsuite/23_containers/map/operations/count.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/operations/count.cc
@@ -23,7 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef map<int, int>::value_type value_type;
diff --git a/libstdc++-v3/testsuite/23_containers/map/operators/1_neg.cc b/libstdc++-v3/testsuite/23_containers/map/operators/1_neg.cc
index 6af182e..d524f64 100644
--- a/libstdc++-v3/testsuite/23_containers/map/operators/1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/operators/1_neg.cc
@@ -26,7 +26,6 @@
 // libstdc++/86: map & set iterator comparisons are not type-safe
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::map<unsigned int, int> mapByIndex;
   std::map<std::string, unsigned> mapByName;
   
diff --git a/libstdc++-v3/testsuite/23_containers/map/operators/2.cc b/libstdc++-v3/testsuite/23_containers/map/operators/2.cc
index 2236cef..fdc5bad 100644
--- a/libstdc++-v3/testsuite/23_containers/map/operators/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/operators/2.cc
@@ -49,8 +49,6 @@ struct DefaultConstructibleType
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using __gnu_test::rvalstruct;
   using __gnu_test::counter_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/multimap/allocator/copy.cc
index 658e4a0..4b30945 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/allocator/copy.cc
@@ -33,7 +33,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, false> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, true> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -57,7 +55,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, true> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/multimap/allocator/copy_assign.cc
index e8022f8..6028c04 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/allocator/copy_assign.cc
@@ -33,7 +33,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, false> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -47,7 +46,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, true> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -61,8 +59,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef tracker_allocator<std::pair<const int, int>> alloc_type;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/allocator/init-list.cc b/libstdc++-v3/testsuite/23_containers/multimap/allocator/init-list.cc
index 0c21b7c..b9116b0 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/allocator/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/allocator/init-list.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef tracker_allocator<std::pair<const int, int>> alloc_type;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/multimap/allocator/minimal.cc
index 528347d..7da6ac8 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/allocator/minimal.cc
@@ -36,7 +36,6 @@ template class std::multimap<T, U, Cmp, SimpleAllocator<std::pair<const T, U>>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<std::pair<const T, U>> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/multimap/allocator/move.cc
index c1f3e74..4f311ea 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/allocator/move.cc
@@ -33,7 +33,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<std::pair<const T, U>> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -49,7 +48,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<std::pair<const T, U>> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/multimap/allocator/move_assign.cc
index b6b7586..e1e051d 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/allocator/move_assign.cc
@@ -33,7 +33,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, false> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -47,7 +46,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, true> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -63,8 +61,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef propagating_allocator<std::pair<const int, int>, false,
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/multimap/allocator/swap.cc
index 7d1891e..4f786bd 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/allocator/swap.cc
@@ -50,7 +50,6 @@ operator!=(const propagating_allocator<std::pair<const T, U>, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, false> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -66,7 +65,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, U>, true> alloc_type;
   typedef std::multimap<T, U, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc b/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc
index 22002e1..6e9953b 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc
@@ -23,8 +23,6 @@
 // libstdc++/29134
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::multimap<int, int> mm;
 
   VERIFY( (mm.max_size() == std::allocator<std::_Rb_tree_node<
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/multimap/cons/moveable.cc
index 07c0592..411faa89 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/cons/moveable.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::multimap<int, int> a,b;
   a.insert(std::make_pair(2,0));
   b.insert(std::make_pair(1,0));
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct5_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct5_neg.cc
index a17e61d..5a32124 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct5_neg.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::uneq_allocator<std::pair<const int, int> > alloc_type;
   typedef __gnu_debug::multimap<int, int, std::less<int>, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/move_assign_neg.cc
index da8bd36..ec117c5 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/move_assign_neg.cc
@@ -22,8 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::propagating_allocator<std::pair<const int, int>,
 					    false> alloc_type;
   typedef __gnu_debug::multimap<int, int, std::less<int>, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/move_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/move_neg.cc
index 525b80e..d376b21 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/move_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/move_neg.cc
@@ -26,8 +26,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef uneq_allocator<std::pair<const int, int> > alloc_type;
   typedef __gnu_debug::multimap<int, int, std::less<int>, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/init-list.cc b/libstdc++-v3/testsuite/23_containers/multimap/init-list.cc
index 341da84..c2ce1c3 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/init-list.cc
@@ -23,10 +23,8 @@
 
 using namespace std;
 
-int test01()
+void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef multimap<int,double> Container;
   typedef Container::iterator iterator;
   typedef pair<iterator,iterator> itpair;
@@ -52,8 +50,6 @@ int test01()
   VERIFY(m.count(5) == 2);
   VERIFY(m.count(42) == 1);
   VERIFY(m.count(7) == 2);
-
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/dr130.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/dr130.cc
index 10d1404..f015227 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/dr130.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/dr130.cc
@@ -31,7 +31,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   multimap<int, int> mm0;
@@ -58,7 +57,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   multimap<int, int> mm0;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/1.cc
index 6f2d0a8..5378bb6 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/emplace/1.cc
@@ -36,8 +36,6 @@ private:
   std::vector<double> coords;
 };
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   typedef std::multimap<char, std::vector<double>> MMap;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/extract.cc
index cad131c..ec11aee 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/extract.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/extract.cc
@@ -26,8 +26,6 @@ using test_type = std::multimap<int, int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ {1, 10}, { 1, 11 }, {2, 20}, { 2, 21}, {3, 30}, { 3, 31 } };
   test_type::node_type node;
   test_type::iterator pos;
@@ -97,8 +95,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ {1, 10}, { 1, 11 }, {2, 20}, { 2, 21}, {3, 30}, { 3, 31 } };
   test_type::node_type node;
   test_type::iterator pos;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/1.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/1.cc
index 9c9c25d..7d605e2 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/1.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multimap<int, rvalstruct> Map;
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multimap<int, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/2.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/2.cc
index 632207d..ed88fef 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/2.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multimap<rvalstruct, rvalstruct> Map;
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multimap<rvalstruct, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/22102.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/22102.cc
index e0f68ab..6e21685 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/22102.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/22102.cc
@@ -25,7 +25,6 @@
 // libstdc++/22102
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::multimap<int, int>   Mmap;
   typedef Mmap::value_type          value_type;
   typedef Mmap::iterator            iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/3.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/3.cc
index dda817c..f18575e 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/3.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multimap<int, rvalstruct> Map;
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multimap<int, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/4.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/4.cc
index 690d88e..470e9d2 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/insert/4.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multimap<rvalstruct, rvalstruct> Map;
@@ -46,7 +45,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multimap<rvalstruct, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/merge.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/merge.cc
index 70541ff..2cc8b2a 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/merge.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/merge.cc
@@ -26,8 +26,6 @@ using test_type = std::multimap<int, int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {1, 11}, {2, 20}, {2, 21}, {3, 30}, {3, 31} };
   test_type c1 = c0, c2 = c0;
 
@@ -46,8 +44,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {1, 11}, {2, 20}, {2, 21}, {3, 30}, {3, 31} };
   test_type c1 = c0;
   std::multimap<int, int, std::less<>> c2( c0.begin(), c0.end() );
@@ -68,8 +64,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {1, 11}, {2, 20}, {2, 21}, {3, 30}, {3, 31} };
   test_type c1 = c0;
   std::multimap<int, int, std::greater<>> c2( c0.begin(), c0.end() );
@@ -90,8 +84,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {1, 11}, {2, 20}, {2, 21}, {3, 30}, {3, 31} };
   test_type c1 = c0;
   std::map<int, int, std::greater<>> c2( c0.begin(), c0.end() );
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/1.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/1.cc
index 7ba71b6..b664e1e 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/1.cc
@@ -36,7 +36,6 @@ namespace std
 // Should use multimap specialization for swap.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::multimap<T, int> A;
   std::multimap<T, int> B;
   swap_calls = 0;
@@ -47,7 +46,6 @@ void test01()
 // Should use multimap specialization for swap.
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   multimap<T, int> A;
   multimap<T, int> B;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/2.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/2.cc
index d9058cd..6d96f5e 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/2.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef pair<const char, int> my_pair;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/3.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/3.cc
index 0b6d3a8..eafc5c8 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap/3.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef pair<const char, int> my_pair;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/operations/1.cc b/libstdc++-v3/testsuite/23_containers/multimap/operations/1.cc
index 281a7fd..51a5ae8 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/operations/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/operations/1.cc
@@ -24,7 +24,6 @@
 // A few tests for equal_range, in the occasion of libstdc++/29385.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   multimap<int, int> mm0;
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/operations/count.cc b/libstdc++-v3/testsuite/23_containers/multimap/operations/count.cc
index 0238e1e5..d5ee57d 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/operations/count.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/operations/count.cc
@@ -23,7 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef multimap<int, int>::value_type value_type;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/multiset/allocator/copy.cc
index dfa2d57..32cece0 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/allocator/copy.cc
@@ -31,7 +31,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -43,7 +42,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -55,7 +53,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/multiset/allocator/copy_assign.cc
index 1f98171..3e63a0d 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/allocator/copy_assign.cc
@@ -31,7 +31,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -59,8 +57,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef tracker_allocator<int> alloc_type;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/allocator/init-list.cc b/libstdc++-v3/testsuite/23_containers/multiset/allocator/init-list.cc
index f0b0b20..0e7c564 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/allocator/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/allocator/init-list.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef tracker_allocator<int> alloc_type;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/multiset/allocator/minimal.cc
index cb284e7..7f25f5f 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/allocator/minimal.cc
@@ -34,7 +34,6 @@ template class std::multiset<T, Cmp, SimpleAllocator<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<T> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/multiset/allocator/move.cc
index c37dcb8..37b922b 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/allocator/move.cc
@@ -31,7 +31,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -47,7 +46,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/multiset/allocator/move_assign.cc
index a03e911..be68af0 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/allocator/move_assign.cc
@@ -31,7 +31,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -61,8 +59,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef propagating_allocator<int, false, tracker_allocator<int>> alloc_type;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/multiset/allocator/swap.cc
index ebcde05..3172a0c 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/allocator/swap.cc
@@ -48,7 +48,6 @@ operator!=(const propagating_allocator<T, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -64,7 +63,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::multiset<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc b/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc
index 594c334..2a8ab0b 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc
@@ -23,8 +23,6 @@
 // libstdc++/29134
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::multiset<int> ms;
 
   VERIFY( ms.max_size()
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/multiset/cons/moveable.cc
index b23d02b..848c0e4 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/cons/moveable.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::multiset<int> a,b;
   a.insert(2);
   b.insert(1);
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct5_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct5_neg.cc
index 859c216..3adbb70 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct5_neg.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::multiset<int, std::less<int>, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/invalidation/2.cc
index ef630f7..6f9c185 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/invalidation/2.cc
@@ -27,7 +27,6 @@ using std::advance;
 // Erase
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   multiset<int> v;
   for (int i = 0; i < 20; ++i)
     v.insert(i);
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/move_assign_neg.cc
index 154c1e2..5e7d357 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/move_assign_neg.cc
@@ -22,8 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::propagating_allocator<int, false> alloc_type;
   typedef __gnu_debug::multiset<int, std::less<int>, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/move_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/move_neg.cc
index 7ea591d..19d646c 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/move_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/move_neg.cc
@@ -26,8 +26,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef uneq_allocator<int> alloc_type;
   typedef __gnu_debug::multiset<int, std::less<int>, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/init-list.cc b/libstdc++-v3/testsuite/23_containers/multiset/init-list.cc
index 0442d23..2f7d08b 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/init-list.cc
@@ -23,10 +23,8 @@
 
 using namespace std;
 
-int test01()
+void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   multiset<int> m({ 1, 5, 5, 37 });
   VERIFY(m.size() == 4);
   VERIFY(m.count(1) == 1);
@@ -48,8 +46,6 @@ int test01()
   VERIFY(m.count(102) == 1);
   VERIFY(m.count(42) == 2);
   VERIFY(m.count(1) == 0);
-
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/dr130.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/dr130.cc
index 3cd5676..d7dbdfa 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/dr130.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/dr130.cc
@@ -31,7 +31,6 @@ using namespace std;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   multiset<int> ms0;
@@ -57,7 +56,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   multiset<int> ms0;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/1.cc
index 17ae625..7a84bf9 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/emplace/1.cc
@@ -41,8 +41,6 @@ struct PathPointLess
   { return __lhs.getType() < __rhs.getType(); }
 };
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   typedef std::multiset<PathPoint, PathPointLess> Mset;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/extract.cc
index 56c2a28..5f15feb 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/extract.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/extract.cc
@@ -26,8 +26,6 @@ using test_type = std::multiset<int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ 1, 1, 2, 2, 3, 3 };
   test_type::node_type node;
   test_type::iterator pos;
@@ -87,8 +85,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ 1, 1, 2, 2, 3, 3 };
   test_type::node_type node;
   test_type::iterator pos;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/1.cc
index 400a2bc..d2992f3 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/1.cc
@@ -38,7 +38,6 @@ operator<(std::pair<int, int> const& lhs, std::pair<int, int> const& rhs)
 
 int main () 
 {
-  bool test __attribute__((unused)) = true;
   typedef std::multiset<std::pair<int, int> >::iterator iterator;
   std::pair<int, int> p(69, 0);
   std::multiset<std::pair<int, int> > s;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/2.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/2.cc
index 08c08e4..531eb07 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/2.cc
@@ -25,7 +25,6 @@
 // and libstdc++/19433.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   multiset<int> ms0, ms1;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/22102.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/22102.cc
index 37b1c1f..c96ae9f 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/22102.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/22102.cc
@@ -25,7 +25,6 @@
 // libstdc++/22102
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::multiset<int>        Mset;
   typedef Mset::value_type          value_type;
   typedef Mset::iterator            iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/3.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/3.cc
index d0bc213..0aca187 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/3.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multiset<rvalstruct> Set;
@@ -42,7 +41,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multiset<rvalstruct> Set;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/4.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/4.cc
index d6f7956..0c3ad78 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/4.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multiset<rvalstruct> Set;
@@ -42,7 +41,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::multiset<rvalstruct> Set;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/merge.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/merge.cc
index ba422b8..f4a1f44 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/merge.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/merge.cc
@@ -26,8 +26,6 @@ using test_type = std::multiset<int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c0{ 1, 1, 2, 2, 3, 3 };
   test_type c1 = c0, c2 = c0;
 
@@ -46,8 +44,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c0{ 1, 1, 2, 2, 3, 3 };
   test_type c1 = c0;
   std::multiset<int, std::less<>> c2( c0.begin(), c0.end() );
@@ -88,8 +84,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ 1, 1, 2, 2, 3, 3 };
   test_type c1 = c0;
   std::set<int, std::greater<>> c2( c0.begin(), c0.end() );
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/1.cc
index 97d9ad1..b8c8fee 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/1.cc
@@ -36,7 +36,6 @@ namespace std
 // Should use multiset specialization for swap.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::multiset<T> A;
   std::multiset<T> B;
   swap_calls = 0;
@@ -47,7 +46,6 @@ void test01()
 // Should use multiset specialization for swap.
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   multiset<T> A;
   multiset<T> B;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/2.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/2.cc
index 9d2400f..52b29a2 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/2.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/3.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/3.cc
index 7656694..f81cfb4 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/3.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/operations/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/operations/1.cc
index 6eeaa30..646ea0a 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/operations/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/operations/1.cc
@@ -24,7 +24,6 @@
 // A few tests for equal_range, in the occasion of libstdc++/29385.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   multiset<int> ms0;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/operations/count.cc b/libstdc++-v3/testsuite/23_containers/multiset/operations/count.cc
index 024715a..869ccb7 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/operations/count.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/operations/count.cc
@@ -23,7 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   multiset<int> ms0;
diff --git a/libstdc++-v3/testsuite/23_containers/priority_queue/moveable.cc b/libstdc++-v3/testsuite/23_containers/priority_queue/moveable.cc
index a60e5e2..1912d2a 100644
--- a/libstdc++-v3/testsuite/23_containers/priority_queue/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/priority_queue/moveable.cc
@@ -28,8 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::priority_queue<int> a,b;
   a.push(1);
   b = std::move(a);
diff --git a/libstdc++-v3/testsuite/23_containers/queue/moveable.cc b/libstdc++-v3/testsuite/23_containers/queue/moveable.cc
index 59d9439..929b881 100644
--- a/libstdc++-v3/testsuite/23_containers/queue/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/queue/moveable.cc
@@ -28,8 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::queue<int> a,b;
   a.push(1);
   b = std::move(a);
diff --git a/libstdc++-v3/testsuite/23_containers/set/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/set/allocator/copy.cc
index 51ffad8..b3db5c2 100644
--- a/libstdc++-v3/testsuite/23_containers/set/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/allocator/copy.cc
@@ -31,7 +31,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -43,7 +42,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -55,7 +53,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/set/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/set/allocator/copy_assign.cc
index 01d3050..d522bf4 100644
--- a/libstdc++-v3/testsuite/23_containers/set/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/allocator/copy_assign.cc
@@ -31,7 +31,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -59,8 +57,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef tracker_allocator<int> alloc_type;
diff --git a/libstdc++-v3/testsuite/23_containers/set/allocator/init-list.cc b/libstdc++-v3/testsuite/23_containers/set/allocator/init-list.cc
index ed44a99..d5e093b 100644
--- a/libstdc++-v3/testsuite/23_containers/set/allocator/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/allocator/init-list.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef tracker_allocator<int> alloc_type;
diff --git a/libstdc++-v3/testsuite/23_containers/set/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/set/allocator/minimal.cc
index a6ababa..f28cf4e 100644
--- a/libstdc++-v3/testsuite/23_containers/set/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/allocator/minimal.cc
@@ -34,7 +34,6 @@ template class std::set<T, Cmp, SimpleAllocator<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<T> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/set/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/set/allocator/move.cc
index fecbfcb..2545e55 100644
--- a/libstdc++-v3/testsuite/23_containers/set/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/allocator/move.cc
@@ -33,7 +33,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -49,7 +48,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/set/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/set/allocator/move_assign.cc
index 09c5f26..60c0835 100644
--- a/libstdc++-v3/testsuite/23_containers/set/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/allocator/move_assign.cc
@@ -33,7 +33,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -47,7 +46,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -63,8 +61,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef propagating_allocator<int, false, tracker_allocator<int>> alloc_type;
@@ -93,8 +89,6 @@ void test03()
 
 void test04()
 {
-  bool test __attribute__((unused)) = true;
-
   using namespace __gnu_test;
 
   typedef tracker_allocator<int> alloc_type;
diff --git a/libstdc++-v3/testsuite/23_containers/set/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/set/allocator/swap.cc
index 471f726..e9fc18f 100644
--- a/libstdc++-v3/testsuite/23_containers/set/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/allocator/swap.cc
@@ -48,7 +48,6 @@ operator!=(const propagating_allocator<T, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -64,7 +63,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::set<T, Cmp, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc b/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc
index f5e65be..0c5c5ae 100644
--- a/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc
@@ -23,8 +23,6 @@
 // libstdc++/29134
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::set<int> s;
 
   VERIFY( s.max_size() ==
diff --git a/libstdc++-v3/testsuite/23_containers/set/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/set/cons/moveable.cc
index 4f421a2..29cf909 100644
--- a/libstdc++-v3/testsuite/23_containers/set/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/cons/moveable.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::set<int> a,b;
   a.insert(2);
   b.insert(1);
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct5_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct5_neg.cc
index 0d42b9d..095219e 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct5_neg.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::set<int, std::less<int>, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/set/debug/invalidation/2.cc
index 1f95c94..2787bdf 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/invalidation/2.cc
@@ -27,8 +27,6 @@ using std::advance;
 // Erase
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   set<int> v;
   for (int i = 0; i < 20; ++i)
     v.insert(i);
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/move_assign_neg.cc
index 33ce5e7..1bf9768 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/move_assign_neg.cc
@@ -22,8 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::propagating_allocator<int, false> alloc_type;
   typedef __gnu_debug::set<int, std::less<int>, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/move_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/move_neg.cc
index 6d6501c..3388c17 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/move_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/move_neg.cc
@@ -26,8 +26,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef uneq_allocator<int> alloc_type;
   typedef __gnu_debug::set<int, std::less<int>, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/set/init-list.cc b/libstdc++-v3/testsuite/23_containers/set/init-list.cc
index be2df5d..f2f1cad 100644
--- a/libstdc++-v3/testsuite/23_containers/set/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/init-list.cc
@@ -23,10 +23,8 @@
 
 using namespace std;
 
-int test01()
+void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   set<int> m({ 1, 5, 37 });
   VERIFY(m.size() == 3);
   VERIFY(m.count(1) == 1);
@@ -48,8 +46,6 @@ int test01()
   VERIFY(m.count(102) == 1);
   VERIFY(m.count(42) == 1);
   VERIFY(m.count(1) == 0);
-
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/17948.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/17948.cc
index 0208e87..e5ab130 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/17948.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/17948.cc
@@ -21,7 +21,6 @@
 // libstdc++/17948
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef set<int>::size_type size_type;
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/dr130.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/dr130.cc
index 1fd6433..438dddd 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/dr130.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/dr130.cc
@@ -25,7 +25,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   set<int> s0;
@@ -47,7 +46,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   set<int> s0;
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/1.cc
index 6f829bd..739e1c2 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/emplace/1.cc
@@ -41,8 +41,6 @@ struct PathPointLess
   { return __lhs.getType() < __rhs.getType(); }
 };
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   typedef std::set<PathPoint, PathPointLess> Set;
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/extract.cc
index db5872a4..d70ad27 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/extract.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/extract.cc
@@ -26,8 +26,6 @@ using test_type = std::set<int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ 1, 2, 3 };
   test_type::node_type node;
   test_type::insert_return_type ins;
@@ -94,8 +92,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ 1, 2, 3 };
   test_type::node_type node;
   test_type::insert_return_type ins;
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/1.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/1.cc
index d9264a8..2814105 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/1.cc
@@ -25,7 +25,6 @@
 // and libstdc++/19433.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   set<int> s0, s1;
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/2.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/2.cc
index 1827423..001ce7b 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/2.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::set<rvalstruct> Set;
@@ -43,7 +42,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::set<rvalstruct> Set;
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/3.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/3.cc
index b3c1adb..bcb0113 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/insert/3.cc
@@ -26,7 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::set<rvalstruct> Set;
@@ -42,7 +41,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::set<rvalstruct> Set;
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/merge.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/merge.cc
index b1e0693..85c1186 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/merge.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/merge.cc
@@ -26,8 +26,6 @@ using test_type = std::set<int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ 1, 2, 3 };
   test_type c1 = c0, c2 = c0;
   c1.merge(c2);
@@ -47,8 +45,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ 1, 2, 3 };
   test_type c1 = c0;
   std::set<int, std::less<>> c2( c0.begin(), c0.end() );
@@ -69,8 +65,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ 1, 2, 3 };
   test_type c1 = c0;
   std::set<int, std::greater<>> c2( c0.begin(), c0.end() );
@@ -95,8 +89,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ 1, 2, 3 };
   test_type c1 = c0;
   std::multiset<int, std::greater<>> c2( c0.begin(), c0.end() );
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/1.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/1.cc
index e3b5cca..4f14e3e 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/1.cc
@@ -36,7 +36,6 @@ namespace std
 // Should use set specialization for swap.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::set<T> A;
   std::set<T> B;
   swap_calls = 0;
@@ -47,7 +46,6 @@ void test01()
 // Should use set specialization for swap.
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   set<T> A;
   set<T> B;
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/2.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/2.cc
index 8c97a77..3958378 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/2.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/3.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/3.cc
index e6fc1e1..5dfa2b6 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/swap/3.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
diff --git a/libstdc++-v3/testsuite/23_containers/set/operations/1.cc b/libstdc++-v3/testsuite/23_containers/set/operations/1.cc
index 2409904..ad393f2 100644
--- a/libstdc++-v3/testsuite/23_containers/set/operations/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/operations/1.cc
@@ -24,7 +24,6 @@
 // A few tests for equal_range, in the occasion of libstdc++/29385.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   set<int> s0;
diff --git a/libstdc++-v3/testsuite/23_containers/set/operations/count.cc b/libstdc++-v3/testsuite/23_containers/set/operations/count.cc
index e9d6da8..5ff15ab 100644
--- a/libstdc++-v3/testsuite/23_containers/set/operations/count.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/operations/count.cc
@@ -23,7 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   set<int> s0;
diff --git a/libstdc++-v3/testsuite/23_containers/set/operators/1_neg.cc b/libstdc++-v3/testsuite/23_containers/set/operators/1_neg.cc
index 7c9c952..9d9c808 100644
--- a/libstdc++-v3/testsuite/23_containers/set/operators/1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/operators/1_neg.cc
@@ -26,8 +26,6 @@
 // libstdc++/86: map & set iterator comparisons are not type-safe
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::set<unsigned int> setByIndex;
   std::set<std::string> setByName;
   
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/copy.cc
index 9c86f277..cdad276 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/copy.cc
@@ -39,7 +39,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::unordered_map<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -52,7 +51,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_map<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -65,7 +63,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_map<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/copy_assign.cc
index 1946c01..434c097 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/copy_assign.cc
@@ -39,7 +39,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::unordered_map<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -55,7 +54,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_map<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/minimal.cc
index 6f48873..1efc6eb 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/minimal.cc
@@ -46,7 +46,6 @@ template class std::unordered_map<T, T, hash, equal_to, SimpleAllocator<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<T> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::unordered_map<T, T, hash, equal_to, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/move.cc
index 215c08f..ca8fee1 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/move.cc
@@ -39,7 +39,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::unordered_map<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -54,7 +53,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::unordered_map<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/move_assign.cc
index 000c969..a399dd1 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/move_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::counter_type;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<counter_type, false> alloc_type;
   typedef __gnu_test::counter_type_hasher hash;
   typedef std::unordered_map<counter_type, counter_type, hash,
@@ -55,7 +54,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<counter_type, true> alloc_type;
   typedef __gnu_test::counter_type_hasher hash;
   typedef std::unordered_map<counter_type, counter_type, hash,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/swap.cc
index 07beef4..cfbe09c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/allocator/swap.cc
@@ -56,7 +56,6 @@ operator!=(const propagating_allocator<std::pair<const T, T>, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, T>, false> alloc_type;
   typedef std::unordered_map<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -74,7 +73,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, T>, true> alloc_type;
   typedef std::unordered_map<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/cons/moveable.cc
index 2b2d6fd..d42f1c0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/cons/moveable.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unordered_map<int, int> a,b;
   a[2]=0;
   b[1]=0;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct5_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct5_neg.cc
index b72f49a..eae800c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct5_neg.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::uneq_allocator<std::pair<const int, int>> alloc_type;
   typedef __gnu_debug::unordered_map<int, int, std::hash<int>,
 				     std::equal_to<int>,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/move_assign_neg.cc
index 60a821e..321777b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/move_assign_neg.cc
@@ -22,8 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::propagating_allocator<std::pair<const int, int>,
 					    false> alloc_type;
   typedef __gnu_debug::unordered_map<int, int,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/move_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/move_neg.cc
index 1b00460..0cca6ea 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/move_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/move_neg.cc
@@ -26,8 +26,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef uneq_allocator<std::pair<const int, int> > alloc_type;
   typedef __gnu_debug::unordered_map<
     int, int, std::hash<int>, std::equal_to<int>, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/dr761.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/dr761.cc
index bc132f1..9307e28 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/dr761.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/dr761.cc
@@ -24,8 +24,7 @@
 
 // DR 761. unordered_map needs an at() member function.
 void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
+{
   typedef std::unordered_map<int, double> map_type;
 
   {
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc
index 6d7b420..84e12f0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc
@@ -37,8 +37,6 @@ namespace
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_map<std::string, int> Map;
   typedef Map::iterator       iterator;
   typedef Map::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/erase/24061-map.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/erase/24061-map.cc
index cdb99ad..fab22ac 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/erase/24061-map.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/erase/24061-map.cc
@@ -26,8 +26,6 @@
 // libstdc++/24061
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_map<std::string, int> Map;
   typedef Map::iterator       iterator;
   typedef Map::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/erase/54276.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/erase/54276.cc
index 580b277..f665fdd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/erase/54276.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/erase/54276.cc
@@ -22,8 +22,6 @@
 #include <unordered_map>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 struct A
 {
   int x;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/hash_policy/dr1189.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/hash_policy/dr1189.cc
index 6209e19..344112a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/hash_policy/dr1189.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/hash_policy/dr1189.cc
@@ -24,9 +24,7 @@
 // DR 1189. Awkward interface for changing the number of buckets
 // in an unordered associative container
 void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-  
+{
   std::unordered_map<int, double> m1;
   m1.reserve(10);
   VERIFY( m1.bucket_count() >= 10 );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/init-list.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/init-list.cc
index 7910575..04342a9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/init-list.cc
@@ -23,10 +23,8 @@
 
 using namespace std;
 
-int test01()
+void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   unordered_map<int,double> m({ { 1, 1.0 }, { 2, 2.0 }, { 42, 237.0 } });
   VERIFY(m.size() == 3);
   VERIFY(m[1] == 1.0);
@@ -44,7 +42,6 @@ int test01()
   VERIFY(m[6] == 66.0);
   VERIFY(m[7] == 77.0);
   VERIFY(m[8] == 88.0);
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/24061-map.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/24061-map.cc
index 80f8582..1e04952 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/24061-map.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/24061-map.cc
@@ -26,8 +26,6 @@
 // libstdc++/24061
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_map<std::string, int> Map;
   typedef Map::iterator       iterator;
   typedef Map::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.C b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.cc
index 8fff3d4..921b8f4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.C
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   {
     std::unordered_map<std::string, std::string> mymap;
     std::pair<std::string, std::string> mypair{std::string("key"),
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/array_syntax.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/array_syntax.cc
index c7c6d04..86cdee5 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/array_syntax.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/array_syntax.cc
@@ -26,8 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_map<std::string, int> Map;
 
   Map m;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/array_syntax_move.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/array_syntax_move.cc
index d681a88..f7b1c45 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/array_syntax_move.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/array_syntax_move.cc
@@ -28,7 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_map<rvalstruct, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_range.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_range.cc
index d4e099e..a89400f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_range.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_range.cc
@@ -27,8 +27,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_map<std::string, int> Map;
   typedef std::pair<const std::string, int> Pair;
 
@@ -57,8 +55,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_map<std::string, int> Map;
   typedef std::pair<const std::string, int> Pair;
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single.cc
index 08d4cd3..eee277c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single.cc
@@ -26,8 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_map<std::string, int> Map;
   typedef std::pair<const std::string, int> Pair;
 
@@ -45,8 +43,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_map<std::string, int> Map;
   typedef std::pair<const std::string, int> Pair;
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single_move-1.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single_move-1.cc
index dd0f612..809f7bf 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single_move-1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single_move-1.cc
@@ -28,7 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_map<int, rvalstruct> Map;
@@ -48,7 +47,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_map<int, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single_move-2.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single_move-2.cc
index 4d8c36c..952a7f2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single_move-2.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/map_single_move-2.cc
@@ -28,7 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_map<rvalstruct, rvalstruct> Map;
@@ -49,7 +48,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_map<rvalstruct, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/61667.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/61667.cc
index db44dc0..bf2e733 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/61667.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/61667.cc
@@ -20,8 +20,6 @@
 #include <unordered_map>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   std::unordered_map<int, int> um(20);
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/emplace.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/emplace.cc
index 3c22236..0027171 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/emplace.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/emplace.cc
@@ -39,8 +39,6 @@ private:
   std::vector<double> coords;
 };
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   typedef std::unordered_map<char, std::vector<double>> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/extract.cc
index 9d9c43e..24609ae 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/extract.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/extract.cc
@@ -25,8 +25,6 @@ using test_type = std::unordered_map<int, int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ {1, 10}, {2, 20}, {3, 30} };
   test_type::node_type node;
   test_type::insert_return_type ins;
@@ -100,8 +98,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ {1, 10}, {2, 20}, {3, 30} };
   test_type::node_type node;
   test_type::insert_return_type ins;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/insert_or_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/insert_or_assign.cc
index 2ff624d..4a64398 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/insert_or_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/insert_or_assign.cc
@@ -21,9 +21,6 @@
 #include <unordered_map>
 #include <testsuite_hooks.h>
 
-
-bool test __attribute__((unused)) = true;
-
 struct Val
 {
   bool moved_from_ctor = false;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/merge.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/merge.cc
index f0035d2..e435045 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/merge.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/merge.cc
@@ -42,8 +42,6 @@ bool equal_elements(const C1& c1, const C2& c2)
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {2, 20}, {3, 30} };
   test_type c1 = c0, c2 = c0;
 
@@ -64,8 +62,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {2, 20}, {3, 30} };
   test_type c1 = c0;
   std::unordered_map<int, int, hash, equal> c2( c0.begin(), c0.end() );
@@ -91,8 +87,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {2, 20}, {3, 30} };
   test_type c1 = c0;
   std::unordered_multimap<int, int, hash, equal> c2( c0.begin(), c0.end() );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/reserve.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/reserve.cc
index 71d9186..1d1ced9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/reserve.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/reserve.cc
@@ -20,8 +20,6 @@
 #include <unordered_map>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   const int N = 1000;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/try_emplace.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/try_emplace.cc
index 4fadb24..5887968 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/try_emplace.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/modifiers/try_emplace.cc
@@ -22,9 +22,6 @@
 #include <functional>
 #include <testsuite_hooks.h>
 
-
-bool test __attribute__((unused)) = true;
-
 struct Val
 {
   bool moved_from_ctor = false;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/operations/count.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/operations/count.cc
index b9805c0..6c1f47f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/operations/count.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/operations/count.cc
@@ -25,7 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef unordered_map<int, int>::value_type value_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/operators/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/operators/1.cc
index 877e88d..ecda9f2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/operators/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/operators/1.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::pair<const int, int> Pair;
   std::unordered_map<int, int> um1, um2;
   VERIFY( um1 == um2 );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/operators/2.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/operators/2.cc
index fd95b04..0126834 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/operators/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/operators/2.cc
@@ -52,8 +52,6 @@ struct DefaultConstructibleType
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using __gnu_test::rvalstruct;
   using __gnu_test::counter_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/copy.cc
index a17be43..3253b64 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/copy.cc
@@ -39,7 +39,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::unordered_multimap<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -52,7 +51,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_multimap<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -65,7 +63,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_multimap<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/copy_assign.cc
index ea67508..0f8e267 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/copy_assign.cc
@@ -39,7 +39,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::unordered_multimap<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -55,7 +54,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_multimap<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/minimal.cc
index ad3f752..8a4151c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/minimal.cc
@@ -47,7 +47,6 @@ template class std::unordered_multimap<T, T, hash, equal_to,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<T> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::unordered_multimap<T, T, hash, equal_to, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/move.cc
index 7edec34..ef5ed55 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/move.cc
@@ -39,7 +39,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::unordered_multimap<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -54,7 +53,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::unordered_multimap<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/move_assign.cc
index 4ea55b4..6b3ca96 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/move_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::counter_type;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<counter_type, false> alloc_type;
   typedef __gnu_test::counter_type_hasher hash;
   typedef std::unordered_multimap<counter_type, counter_type, hash,
@@ -55,7 +54,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<counter_type, true> alloc_type;
   typedef __gnu_test::counter_type_hasher hash;
   typedef std::unordered_multimap<counter_type, counter_type, hash,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/swap.cc
index 1d58624..c21b64f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/allocator/swap.cc
@@ -56,7 +56,6 @@ operator!=(const propagating_allocator<std::pair<const T, T>, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, T>, false> alloc_type;
   typedef std::unordered_multimap<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -74,7 +73,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<std::pair<const T, T>, true> alloc_type;
   typedef std::unordered_multimap<T, T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/moveable.cc
index 3c5c6a8..9c0e854 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/moveable.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unordered_multimap<int, int> a,b;
   a.insert(std::make_pair(2,0));
   b.insert(std::make_pair(1,0));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct5_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct5_neg.cc
index 0c3c50b..237d1be 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct5_neg.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::uneq_allocator<std::pair<const int, int>> alloc_type;
   typedef __gnu_debug::unordered_multimap<int, int,
 					  std::hash<int>, std::equal_to<int>,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/move_assign_neg.cc
index 7320a90..ab75592 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/move_assign_neg.cc
@@ -22,8 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::propagating_allocator<std::pair<const int, int>,
 					    false> alloc_type;
   typedef __gnu_debug::unordered_multimap<int, int, std::hash<int>,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/move_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/move_neg.cc
index 5db854c..3bb3cf0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/move_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/move_neg.cc
@@ -26,8 +26,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef uneq_allocator<std::pair<const int, int> > alloc_type;
   typedef __gnu_debug::unordered_multimap<
     int, int, std::hash<int>, std::equal_to<int>, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/1.cc
index 521fbee..6b9a298 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/1.cc
@@ -37,8 +37,6 @@ namespace
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_multimap<std::string, int> Mmap;
   typedef Mmap::iterator       iterator;
   typedef Mmap::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/2.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/2.cc
index f93138b..4ab5884 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/2.cc
@@ -35,8 +35,6 @@ namespace
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_multimap<std::string, int> Mmap;
   typedef Mmap::iterator       iterator;
   typedef Mmap::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/24061-multimap.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/24061-multimap.cc
index c7f05c6..80a5e7b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/24061-multimap.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/24061-multimap.cc
@@ -26,8 +26,6 @@
 // libstdc++/24061
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_multimap<std::string, int> Mmap;
   typedef Mmap::iterator       iterator;
   typedef Mmap::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/51845-multimap.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/51845-multimap.cc
index 4a4fdb0..8469fd3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/51845-multimap.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/51845-multimap.cc
@@ -25,8 +25,6 @@
 // libstdc++/51845
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multimap<int, int> Mmap;
   typedef Mmap::iterator       iterator;
   typedef Mmap::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/54276.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/54276.cc
index a3492f8..694db25 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/54276.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/erase/54276.cc
@@ -22,8 +22,6 @@
 #include <unordered_map>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 struct A
 {
   int x;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/hash_policy/dr1189.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/hash_policy/dr1189.cc
index 0eb61ff..3db89b7 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/hash_policy/dr1189.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/hash_policy/dr1189.cc
@@ -24,9 +24,7 @@
 // DR 1189. Awkward interface for changing the number of buckets
 // in an unordered associative container
 void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-  
+{
   std::unordered_multimap<int, double> mm1;
   mm1.reserve(10);
   VERIFY( mm1.bucket_count() >= 10 );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/init-list.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/init-list.cc
index c1d0fee..51f3db9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/init-list.cc
@@ -24,10 +24,8 @@
 
 using namespace std;
 
-int test01()
+void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef unordered_multimap<int,double> Container;
   typedef Container::const_iterator iterator;
   typedef pair<iterator,iterator> itpair;
@@ -55,8 +53,6 @@ int test01()
   VERIFY(m.count(5) == 2);
   VERIFY(m.count(42) == 1);
   VERIFY(m.count(7) == 2);
-
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc
index 4134c19..902352c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc
@@ -26,8 +26,6 @@
 // libstdc++/24061
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_multimap<std::string, int> Mmap;
   typedef Mmap::iterator       iterator;
   typedef Mmap::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/51866.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/51866.cc
index ff4b8e0..b040cc0a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/51866.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/51866.cc
@@ -61,8 +61,6 @@ bool num_equal::_S_called_on_moved_instance = false;
 // libstdc++/51866
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   std::unordered_multimap<num, int, num_hash, num_equal> mmap;
   mmap.insert(std::make_pair(num(1), 1));
   mmap.insert(std::make_pair(num(2), 2));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/52476.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/52476.cc
index 3eefb22..d91f7ee 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/52476.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/52476.cc
@@ -25,8 +25,7 @@
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
-  
+ 
   unordered_multimap<int, int> mmap;
   vector<int> values;
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/53115.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/53115.cc
index b305ff2..9fc6fd3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/53115.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/53115.cc
@@ -35,7 +35,6 @@ namespace
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   std::unordered_multimap<int, int> umm;
   umm.insert(make_pair(10, 1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.C b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.cc
index 85e8610..002f64e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.C
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   {
     std::unordered_multimap<std::string, std::string> mymmap;
     std::pair<std::string, std::string> mypair{std::string("key"),
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/hint.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/hint.cc
index b70f788..70b9943 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/hint.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/hint.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multimap<int, int> Map;
   typedef typename Map::value_type Pair;
 
@@ -56,8 +54,6 @@ struct hasher
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multimap<int, int, hasher> Map;
   typedef typename Map::value_type Pair;
 
@@ -89,8 +85,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multimap<int, int> Map;
   typedef typename Map::value_type Pair;
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_range.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_range.cc
index 2cb616f..99f1340 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_range.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_range.cc
@@ -27,8 +27,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multimap<std::string, int> Map;
   typedef std::pair<const std::string, int> Pair;
 
@@ -54,8 +52,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multimap<std::string, int> Map;
   typedef std::pair<const std::string, int> Pair;
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single.cc
index 576d8b4..7750d8f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single.cc
@@ -26,8 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multimap<std::string, int> Map;
   typedef std::pair<const std::string, int> Pair;
 
@@ -44,8 +42,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multimap<std::string, int> Map;
   typedef std::pair<const std::string, int> Pair;
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single_move-1.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single_move-1.cc
index 48f23d8..f3b2819 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single_move-1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single_move-1.cc
@@ -28,7 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_multimap<int, rvalstruct> Map;
@@ -47,7 +46,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_multimap<int, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single_move-2.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single_move-2.cc
index 77b00a2..56e157c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single_move-2.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/multimap_single_move-2.cc
@@ -28,7 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_multimap<rvalstruct, rvalstruct> Map;
@@ -47,7 +46,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_multimap<rvalstruct, rvalstruct> Map;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/emplace.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/emplace.cc
index cb4fb98..06eddcc 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/emplace.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/emplace.cc
@@ -38,8 +38,6 @@ private:
   std::vector<double> coords;
 };
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   typedef std::unordered_multimap<char, std::vector<double>> MMap;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/extract.cc
index 635e7d0..85b2c99 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/extract.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/extract.cc
@@ -25,8 +25,6 @@ using test_type = std::unordered_multimap<int, int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ {1, 10}, { 1, 11 }, {2, 20}, { 2, 21}, {3, 30}, { 3, 31 } };
   test_type::node_type node;
   test_type::iterator pos;
@@ -92,8 +90,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ {1, 10}, { 1, 11 }, {2, 20}, { 2, 21}, {3, 30}, { 3, 31 } };
   test_type::node_type node;
   test_type::iterator pos;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/merge.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/merge.cc
index 3c67e3c..ebb8f18 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/merge.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/merge.cc
@@ -30,8 +30,6 @@ struct equal : std::equal_to<> { };
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {1, 11}, {2, 20}, {2, 21}, {3, 30}, {3, 31} };
   test_type c1 = c0, c2 = c0;
 
@@ -50,8 +48,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {1, 11}, {2, 20}, {2, 21}, {3, 30}, {3, 31} };
   test_type c1 = c0;
   std::unordered_multimap<int, int, hash, equal> c2( c0.begin(), c0.end() );
@@ -72,8 +68,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {1, 11}, {2, 20}, {2, 21}, {3, 30}, {3, 31} };
   test_type c1 = c0;
   std::unordered_multimap<int, int, hash, equal> c2( c0.begin(), c0.end() );
@@ -94,8 +88,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ {1, 10}, {1, 11}, {2, 20}, {2, 21}, {3, 30}, {3, 31} };
   test_type c1 = c0;
   std::unordered_map<int, int, hash, equal> c2( c0.begin(), c0.end() );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/reserve.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/reserve.cc
index 26fdf76..e79762c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/reserve.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/modifiers/reserve.cc
@@ -20,8 +20,6 @@
 #include <unordered_map>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   const int N = 1000;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/count.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/count.cc
index 6766e00..dec0723 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/count.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operations/count.cc
@@ -25,7 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef unordered_multimap<int, int>::value_type value_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/1.cc
index 87db82d..73162f0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/1.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::pair<const int, int> Pair;
   std::unordered_multimap<int, int> umm1, umm2;
   VERIFY( umm1 == umm2 );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/2.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/2.cc
index ab7e699..07a600f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/2.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::pair<const int, int> Pair;
   std::unordered_multimap<int, int> umm1, umm2;
   VERIFY( umm1 == umm2 );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/copy.cc
index 2933948..611d212 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/copy.cc
@@ -39,7 +39,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::unordered_multiset<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -51,7 +50,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_multiset<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -63,7 +61,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_multiset<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/copy_assign.cc
index 8f2089b..8fbd02e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/copy_assign.cc
@@ -39,7 +39,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::unordered_multiset<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -53,7 +52,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_multiset<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/minimal.cc
index 6503469..be0321e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/minimal.cc
@@ -46,7 +46,6 @@ template class std::unordered_multiset<T, hash, equal_to, SimpleAllocator<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<T> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::unordered_multiset<T, hash, equal_to, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/move.cc
index 0339a96..0e8edd3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/move.cc
@@ -39,7 +39,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::unordered_multiset<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -53,7 +52,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::unordered_multiset<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/move_assign.cc
index f969a6e..69e022b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/move_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::counter_type;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<counter_type, false> alloc_type;
   typedef __gnu_test::counter_type_hasher hash;
   typedef std::unordered_multiset<counter_type, hash,
@@ -53,7 +52,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<counter_type, true> alloc_type;
   typedef __gnu_test::counter_type_hasher hash;
   typedef std::unordered_multiset<counter_type, hash,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/swap.cc
index c6f7728..d89165d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/allocator/swap.cc
@@ -56,7 +56,6 @@ operator!=(const propagating_allocator<T, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::unordered_multiset<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -72,7 +71,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_multiset<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/copy.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/copy.cc
index cfa08c7..2f233f2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/copy.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   const int nb = 10000;
   std::unordered_multiset<int> ref;
   for (int i = 0; i != nb; ++i)
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/moveable.cc
index cb9d2cf..1219517 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/moveable.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unordered_multiset<int> a,b;
   a.insert(2);
   b.insert(1);
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct5_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct5_neg.cc
index 5e1a4a6..2576e96 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct5_neg.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::unordered_multiset<int, std::hash<int>,
 					  std::equal_to<int>,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/move_assign_neg.cc
index 410f7c1..6d1fc4a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/move_assign_neg.cc
@@ -22,8 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::propagating_allocator<int, false> alloc_type;
   typedef __gnu_debug::unordered_multiset<int, std::hash<int>,
 					  std::equal_to<int>,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/move_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/move_neg.cc
index e0670e6..65e8dc3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/move_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/move_neg.cc
@@ -26,8 +26,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef uneq_allocator<int> alloc_type;
   typedef __gnu_debug::unordered_multiset<
     int, std::hash<int>, std::equal_to<int>, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/1.cc
index 2fefa0f..238db49 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/1.cc
@@ -37,8 +37,6 @@ namespace
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_multiset<std::string> Mset;
   typedef Mset::iterator       iterator;
   typedef Mset::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/2.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/2.cc
index 625cb46..f76ccfa 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/2.cc
@@ -35,8 +35,6 @@ namespace
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_multiset<std::string> Mset;
   typedef Mset::iterator       iterator;
   typedef Mset::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/24061-multiset.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/24061-multiset.cc
index fc0a4e5..ed8445b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/24061-multiset.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/erase/24061-multiset.cc
@@ -40,8 +40,6 @@ namespace
 // libstdc++/24061
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_multiset<std::string> Mset;
   typedef Mset::iterator       iterator;
   typedef Mset::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/hash_policy/dr1189.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/hash_policy/dr1189.cc
index eb3c04e..55ce880 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/hash_policy/dr1189.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/hash_policy/dr1189.cc
@@ -24,9 +24,7 @@
 // DR 1189. Awkward interface for changing the number of buckets
 // in an unordered associative container
 void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-  
+{
   std::unordered_multiset<int> ms1;
   ms1.reserve(10);
   VERIFY( ms1.bucket_count() >= 10 );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/init-list.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/init-list.cc
index 47327a7..3f14588 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/init-list.cc
@@ -23,10 +23,8 @@
 
 using namespace std;
 
-int test01()
+void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   unordered_multiset<int> m({ 1, 5, 5, 37 });
   VERIFY(m.size() == 4);
   VERIFY(m.count(1) == 1);
@@ -48,8 +46,6 @@ int test01()
   VERIFY(m.count(102) == 1);
   VERIFY(m.count(42) == 2);
   VERIFY(m.count(1) == 0);
-
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc
index 1aa3090..ac58f29 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc
@@ -26,8 +26,6 @@
 // libstdc++/24061
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_multiset<std::string> Mset;
   typedef Mset::iterator       iterator;
   typedef Mset::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/51866.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/51866.cc
index 5352a0b..7c8dfda 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/51866.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/51866.cc
@@ -61,8 +61,6 @@ bool num_equal::_S_called_on_moved_instance = false;
 // libstdc++/51866
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   std::unordered_multiset<num, num_hash, num_equal> mset;
   mset.insert(num(1));
   mset.insert(num(2));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/52476.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/52476.cc
index fbbf42e..6c10504 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/52476.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/52476.cc
@@ -43,8 +43,7 @@ namespace
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
-  
+ 
   unordered_multiset<pair<int, int>, pair_hash, pair_equal_to> mset;
   vector<int> values;
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/53115.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/53115.cc
index bc44e4b..0085ee9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/53115.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/53115.cc
@@ -35,7 +35,6 @@ namespace
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
 
   std::unordered_multiset<int> mms;
   mms.insert(10);
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/hash_policy.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/hash_policy.cc
index b318a9c..97a76f6 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/hash_policy.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/hash_policy.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::numeric_limits<size_t> nl_size_t;
   std::unordered_multiset<int, std::hash<int>, std::equal_to<int>,
 			  __gnu_cxx::throw_allocator_limit<int> > us;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_range.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_range.cc
index 91ee6c4..496df5d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_range.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_range.cc
@@ -40,8 +40,6 @@ namespace
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multiset<std::string> Set;
   Set s;
   VERIFY(s.empty());
@@ -65,8 +63,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multiset<int> Set;
   Set s;
   VERIFY(s.empty());
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_single.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_single.cc
index 6e1a1c1..f2abcf7 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_single.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_single.cc
@@ -39,8 +39,6 @@ namespace
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multiset<std::string> Set;
   Set s;
   VERIFY(s.empty());
@@ -55,8 +53,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_multiset<std::string> Set;
   Set s;
   VERIFY(s.empty());
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_single_move.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_single_move.cc
index 4527987..17e5e96 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_single_move.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/multiset_single_move.cc
@@ -41,7 +41,6 @@ namespace
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_multiset<rvalstruct> Set;
@@ -58,7 +57,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_multiset<rvalstruct> Set;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/emplace.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/emplace.cc
index c9091ab..d916334 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/emplace.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/emplace.cc
@@ -49,8 +49,6 @@ struct PathPointEqual
   { return __lhs.getType() == __rhs.getType(); }
 };
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   typedef std::unordered_multiset<PathPoint, PathPointHasher,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/extract.cc
index e703dc4..4b74140 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/extract.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/extract.cc
@@ -25,8 +25,6 @@ using test_type = std::unordered_multiset<int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ 1, 1, 2, 2, 3, 3 };
   test_type::node_type node;
   test_type::iterator pos;
@@ -85,8 +83,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ 1, 1, 2, 2, 3, 3 };
   test_type::node_type node;
   test_type::iterator pos;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/merge.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/merge.cc
index 4ce4b84..4c2569c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/merge.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/merge.cc
@@ -30,8 +30,6 @@ struct equal : std::equal_to<> { };
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c0{ 1, 1, 2, 2, 3, 3 };
   test_type c1 = c0, c2 = c0;
 
@@ -50,8 +48,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c0{ 1, 1, 2, 2, 3, 3 };
   test_type c1 = c0;
   std::unordered_multiset<int, hash, equal> c2( c0.begin(), c0.end() );
@@ -92,8 +88,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ 1, 1, 2, 2, 3, 3 };
   test_type c1 = c0;
   std::unordered_set<int, hash, equal> c2( c0.begin(), c0.end() );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/reserve.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/reserve.cc
index c8b8065..9f5afb4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/reserve.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/modifiers/reserve.cc
@@ -20,8 +20,6 @@
 #include <unordered_set>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   const int N = 1000;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/count.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/count.cc
index c7013ad..9f4fb9b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/count.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/operations/count.cc
@@ -25,7 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   unordered_multiset<int> ums0;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/operators/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/operators/1.cc
index 765995f..1a3a4b0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/operators/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/operators/1.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unordered_multiset<int> ums1, ums2;
   VERIFY( ums1 == ums2 );
   VERIFY( !(ums1 != ums2) );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/copy.cc
index 9962908..d7998b0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/copy.cc
@@ -39,7 +39,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::unordered_set<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -51,7 +50,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_set<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -63,7 +61,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_set<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/copy_assign.cc
index 601e4a6..c7ec616 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/copy_assign.cc
@@ -39,7 +39,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::unordered_set<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -53,7 +52,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_set<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/ext_ptr.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/ext_ptr.cc
index e1f0746..dba651e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/ext_ptr.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/ext_ptr.cc
@@ -34,7 +34,6 @@ template class std::unordered_set<T, H, E, CustomPointerAlloc<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef CustomPointerAlloc<T> alloc_type;
   typedef std::unordered_set<T, H, E, alloc_type> test_type;
   test_type v;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/minimal.cc
index a3b8b41..e0e28646 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/minimal.cc
@@ -46,7 +46,6 @@ template class std::unordered_set<T, hash, equal_to, SimpleAllocator<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<T> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::unordered_set<T, hash, equal_to, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/move.cc
index 8b96330..4ba9667 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/move.cc
@@ -39,7 +39,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::unordered_set<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -53,7 +52,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::unordered_set<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/move_assign.cc
index c15abfb..f0b420b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/move_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::counter_type;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<counter_type, false> alloc_type;
   typedef __gnu_test::counter_type_hasher hash;
   typedef std::unordered_set<counter_type, hash,
@@ -53,7 +52,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<counter_type, true> alloc_type;
   typedef __gnu_test::counter_type_hasher hash;
   typedef std::unordered_set<counter_type, hash,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/swap.cc
index b7996c6..992ca05 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/swap.cc
@@ -56,7 +56,6 @@ operator!=(const propagating_allocator<T, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::unordered_set<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -72,7 +71,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::unordered_set<T, hash, equal_to, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/buckets/swap.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/buckets/swap.cc
index 68e314b..a6e0226 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/buckets/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/buckets/swap.cc
@@ -39,8 +39,6 @@ namespace
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   // static_assert(std::__cache_default<int, hash>::value,
   // 		"Unexpected default cache value");
   typedef std::unordered_set<int, hash> us_t;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/cons/moveable.cc
index f01328c..1c18588 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/cons/moveable.cc
@@ -28,8 +28,6 @@
 
 int main()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unordered_set<int> a,b;
   a.insert(2);
   b.insert(1);
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct5_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct5_neg.cc
index 4c95ae3..a5c7dc4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct5_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct5_neg.cc
@@ -23,8 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::uneq_allocator<int> alloc_type;
   typedef __gnu_debug::unordered_set<int, std::hash<int>,
 				     std::equal_to<int>, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/debug_functions.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/debug_functions.cc
index 6a45c43..fe918fd 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/debug_functions.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/debug_functions.cc
@@ -23,7 +23,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_debug;
 
   std::unordered_set<int> u = { 0, 1, 2 };
@@ -49,7 +48,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_debug;
 
   std::unordered_set<int> u = { 0, 1, 2 };
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/move_assign_neg.cc
index 6ed3adb..3dd4b36 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/move_assign_neg.cc
@@ -22,8 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::propagating_allocator<int, false> alloc_type;
   typedef __gnu_debug::unordered_set<int, std::hash<int>,
 				     std::equal_to<int>,
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/move_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/move_neg.cc
index 6b3fd6d..8cd5aeb 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/move_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/move_neg.cc
@@ -26,8 +26,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef uneq_allocator<int> alloc_type;
   typedef __gnu_debug::unordered_set<
     int, std::hash<int>, std::equal_to<int>, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/erase/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/erase/1.cc
index 3a25de7..84f00bc 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/erase/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/erase/1.cc
@@ -37,8 +37,6 @@ namespace
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_set<std::string> Set;
   typedef Set::iterator       iterator;
   typedef Set::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/erase/24061-set.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/erase/24061-set.cc
index 33f2188..65bd760 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/erase/24061-set.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/erase/24061-set.cc
@@ -26,8 +26,6 @@
 // libstdc++/24061
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_set<std::string> Set;
   typedef Set::iterator       iterator;
   typedef Set::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/26132.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/26132.cc
index e743fba..0fae199 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/26132.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/26132.cc
@@ -26,8 +26,6 @@
 template<typename _USet>
   void test()
   {
-    bool test __attribute__((unused)) = true;
-
     for (float lf = 1.0; lf < 101.0; lf *= 10.0)
       for (int size = 1; size <= 6561; size *= 3)
 	{
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/71181.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/71181.cc
index 331c713..d6465d3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/71181.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/71181.cc
@@ -24,7 +24,6 @@
 template<typename _USet>
   void test(int threshold)
   {
-    bool test __attribute__((unused)) = true;
     _USet us;
     auto nb_reserved = us.bucket_count();
     us.reserve(nb_reserved);
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/dr1189.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/dr1189.cc
index 2f320b8..03d9b14 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/dr1189.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/dr1189.cc
@@ -24,9 +24,7 @@
 // DR 1189. Awkward interface for changing the number of buckets
 // in an unordered associative container
 void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-  
+{
   std::unordered_set<int> s1;
   s1.reserve(10);
   VERIFY( s1.bucket_count() >= 10 );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/load_factor.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/load_factor.cc
index b6e66ec..c54b07b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/load_factor.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/load_factor.cc
@@ -24,7 +24,6 @@
 template<typename _USet>
   void test()
   {
-    bool test __attribute__((unused)) = true;
     {
       _USet us;
       for (int i = 0; i != 100000; ++i)
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/power2_rehash.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/power2_rehash.cc
index c388b70..d815291 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/power2_rehash.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/power2_rehash.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::__detail::_Power2_rehash_policy policy;
   VERIFY( policy._M_next_bkt(1) == 2 );
   VERIFY( policy._M_next_bkt(2) == 4 );
@@ -38,8 +36,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   std::__detail::_Power2_rehash_policy policy;
 
   for (std::size_t i = 1;;)
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/prime_rehash.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/prime_rehash.cc
index e5e1531..a653b10 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/prime_rehash.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/prime_rehash.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::__detail::_Prime_rehash_policy policy;
 
   for (std::size_t i = 1;;)
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/rehash.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/rehash.cc
index f1b5920..b6d98625 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/rehash.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/rehash.cc
@@ -24,7 +24,6 @@
 template<typename _USet>
   void test()
   {
-    bool test __attribute__((unused)) = true;
     _USet us;
     typedef typename _USet::size_type size_type;
     bool rehashed = false;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/init-list.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/init-list.cc
index 2e9cc09..9f956f4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/init-list.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/init-list.cc
@@ -23,10 +23,8 @@
 
 using namespace std;
 
-int test01()
+void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   unordered_set<int> m({ 1, 5, 37 });
   VERIFY(m.size() == 3);
   VERIFY(m.count(1) == 1);
@@ -48,8 +46,6 @@ int test01()
   VERIFY(m.count(102) == 1);
   VERIFY(m.count(42) == 1);
   VERIFY(m.count(1) == 0);
-
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/24061-set.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/24061-set.cc
index 497cf4c..30b472d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/24061-set.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/24061-set.cc
@@ -26,8 +26,6 @@
 // libstdc++/24061
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-  
   typedef std::unordered_set<std::string> Set;
   typedef Set::iterator       iterator;
   typedef Set::const_iterator const_iterator;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/hash_policy.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/hash_policy.cc
index 694e6a6..78bdaa3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/hash_policy.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/hash_policy.cc
@@ -30,8 +30,6 @@ template<template<typename _Value, typename _Hash,
 	   typename _USet>
   void test01()
   {
-    bool test __attribute__((unused)) = true;
-
     // Make sure whatever happen we restore throw allocator limit at exit.
     __gnu_cxx::limit_condition::adjustor_base adj;
 
@@ -76,8 +74,6 @@ template<template<typename _Value, typename _Hash,
 	   typename _USet>
   void test02()
   {
-    bool test __attribute__((unused)) = true;
-
     // Make sure whatever happen we restore throw allocator limit at exit.
     __gnu_cxx::limit_condition::adjustor_base adj;
 
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/move_range.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/move_range.cc
index caed770..c4a6057 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/move_range.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/move_range.cc
@@ -25,8 +25,6 @@
 #include <testsuite_hooks.h>
 #include <testsuite_counter_type.h>
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   using namespace __gnu_test;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_range.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_range.cc
index 3ef16fc..cbeb9c0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_range.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_range.cc
@@ -25,8 +25,6 @@
 #include <unordered_set>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   typedef std::unordered_set<std::string> Set;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_single.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_single.cc
index 9d3758a..d3801c2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_single.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_single.cc
@@ -26,8 +26,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_set<std::string> Set;
   Set s;
   VERIFY(s.empty());
@@ -42,8 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::unordered_set<std::string> Set;
   Set s;
   VERIFY(s.empty());
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_single_move.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_single_move.cc
index 470050e..4cf7647 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_single_move.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/insert/set_single_move.cc
@@ -28,7 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_set<rvalstruct> Set;
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::rvalstruct;
 
   typedef std::unordered_set<rvalstruct> Set;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/max_load_factor/robustness.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/max_load_factor/robustness.cc
index 45611e4..794ae0e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/max_load_factor/robustness.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/max_load_factor/robustness.cc
@@ -27,8 +27,6 @@ template<template<typename _Value, typename _Hash,
 	   typename _USet>
   void test()
   {
-    bool test __attribute__((unused)) = true;
-
     typedef std::numeric_limits<std::size_t> nl_size_t;
     _USet<int, std::hash<int>, std::equal_to<int>,
 	  __gnu_cxx::throw_allocator_limit<int> > us;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/emplace.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/emplace.cc
index 8fbbb1b..e3ce2b5 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/emplace.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/emplace.cc
@@ -49,8 +49,6 @@ struct PathPointEqual
   { return __lhs.getType() == __rhs.getType(); }
 };
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   typedef std::unordered_set<PathPoint, PathPointHasher, PathPointEqual> Set;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/extract.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/extract.cc
index cb48cbc..a06835a 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/extract.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/extract.cc
@@ -25,8 +25,6 @@ using test_type = std::unordered_set<int>;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ 1, 2, 3 };
   test_type::node_type node;
   test_type::insert_return_type ins;
@@ -94,8 +92,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   test_type c{ 1, 2, 3 };
   test_type::node_type node;
   test_type::insert_return_type ins;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/merge.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/merge.cc
index 29387dd..8178410 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/merge.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/merge.cc
@@ -42,8 +42,6 @@ bool equal_elements(const C1& c1, const C2& c2)
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ 1, 2, 3, };
   test_type c1 = c0, c2 = c0;
 
@@ -64,8 +62,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ 1, 2, 3, };
   test_type c1 = c0;
   std::unordered_set<int, hash, equal> c2( c0.begin(), c0.end() );
@@ -91,8 +87,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-
   const test_type c0{ 1, 2, 3, };
   test_type c1 = c0;
   std::unordered_multiset<int, hash, equal> c2( c0.begin(), c0.end() );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/reserve.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/reserve.cc
index ae4333f..732e149 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/reserve.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/reserve.cc
@@ -20,8 +20,6 @@
 #include <unordered_set>
 #include <testsuite_hooks.h>
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   const int N = 1000;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/swap.cc
index d205d68..2c493e3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/modifiers/swap.cc
@@ -22,7 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::unordered_set<int> us1 { 0, 1 };
   {
     std::unordered_set<int> us2(std::move(us1));
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/operations/count.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/operations/count.cc
index 1fb685c..1450b74 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/operations/count.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/operations/count.cc
@@ -25,7 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   unordered_set<int> us0;
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/operators/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/operators/1.cc
index 1cfb3b7..eb0cac5 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/operators/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/operators/1.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::unordered_set<int> us1, us2;
   VERIFY( us1 == us2 );
   VERIFY( !(us1 != us2) );
diff --git a/libstdc++-v3/testsuite/23_containers/vector/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/vector/allocator/copy.cc
index 2a96196..098f6e4 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/allocator/copy.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -39,7 +38,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -51,7 +49,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/vector/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/vector/allocator/copy_assign.cc
index 6e10c19..76b0500 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/allocator/copy_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/vector/allocator/ext_ptr.cc b/libstdc++-v3/testsuite/23_containers/vector/allocator/ext_ptr.cc
index c774074..605b1f7 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/allocator/ext_ptr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/allocator/ext_ptr.cc
@@ -30,7 +30,6 @@ template class std::vector<T, CustomPointerAlloc<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef CustomPointerAlloc<T> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/allocator/minimal.cc b/libstdc++-v3/testsuite/23_containers/vector/allocator/minimal.cc
index 16310dd..bccd593 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/allocator/minimal.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/allocator/minimal.cc
@@ -30,7 +30,6 @@ template class std::vector<T, SimpleAllocator<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef SimpleAllocator<T> alloc_type;
   typedef std::allocator_traits<alloc_type> traits_type;
   typedef std::vector<T, alloc_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/vector/allocator/move.cc
index c9cf806..1a79362 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/allocator/move.cc
@@ -27,7 +27,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/vector/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/vector/allocator/move_assign.cc
index 8443857..ba8f7c8 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/allocator/move_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -57,7 +55,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/vector/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/vector/allocator/swap.cc
index 57bbdda..30532f2 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/allocator/swap.cc
@@ -44,7 +44,6 @@ operator!=(const propagating_allocator<T, false>&,
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -60,7 +59,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/6886.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/6886.cc
index f8bdecc..55e8fd6 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/6886.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/6886.cc
@@ -25,7 +25,6 @@
 // libstdc++/6886
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef std::vector<bool>  bvec;
   int  i, num = 0;
   bvec v;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/72847.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/72847.cc
index 7bd8b39..d5f3e65 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/72847.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/72847.cc
@@ -26,8 +26,6 @@
 void
 test01()
 {
-  bool test __attribute((unused)) = true;
-
   typedef bool value_type;
   typedef __gnu_cxx::throw_allocator_limit<value_type> allocator_type;
   typedef std::vector<value_type, allocator_type> test_type;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/copy.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/copy.cc
index c961f0c..62b808f 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/copy.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/copy.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -39,7 +38,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -51,7 +49,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/copy_assign.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/copy_assign.cc
index 1809a15..9177a8b 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/copy_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/copy_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/ext_ptr.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/ext_ptr.cc
index 940a3b7..d0c69be 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/ext_ptr.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/ext_ptr.cc
@@ -30,7 +30,6 @@ template class std::vector<T, CustomPointerAlloc<T>>;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef CustomPointerAlloc<T> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/move.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/move.cc
index 177d968..a409a14 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/move.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/move.cc
@@ -27,7 +27,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef uneq_allocator<T> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/move_assign.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/move_assign.cc
index 705e151..0354275 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/move_assign.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/move_assign.cc
@@ -27,7 +27,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -41,7 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -57,7 +55,6 @@ void test02()
 
 void test03()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/swap.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/swap.cc
index 0840c0b..f399525 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/allocator/swap.cc
@@ -47,7 +47,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, false> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
@@ -63,7 +62,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   typedef propagating_allocator<T, true> alloc_type;
   typedef std::vector<T, alloc_type> test_type;
   test_type v1(alloc_type(1));
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/1.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/1.cc
index b1b2f37..fc2a516 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/1.cc
@@ -75,8 +75,6 @@ const unsigned N11 = sizeof(A11) / sizeof(bool);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<bool>  vec_type;
 
   vec_type v;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc
index c9994e1..c86e7c3 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc
@@ -24,8 +24,6 @@
 // libstdc++/29134
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   using std::vector;
   using std::numeric_limits;
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/shrink_to_fit.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/shrink_to_fit.cc
index 62f9791..2603507 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/shrink_to_fit.cc
@@ -22,8 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<bool> vb(__CHAR_BIT__ * sizeof(unsigned long) + 1);
   vb.pop_back();
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/cons/1.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/cons/1.cc
index 5cae6d5..a55294b 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/cons/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/cons/1.cc
@@ -121,8 +121,6 @@ const unsigned N9 = sizeof(A9) / sizeof(bool);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<bool>  vec_type;
 
   const vec_type v1_ref(A1, A1 + N1);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/cons/2.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/cons/2.cc
index 723d2cd..43b546a 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/cons/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/cons/2.cc
@@ -121,8 +121,6 @@ const unsigned N9 = sizeof(A9) / sizeof(bool);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<bool>  vec_type;
 
   vec_type v1;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/erase/1.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/erase/1.cc
index 6d17e9b..1281e35 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/erase/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/erase/1.cc
@@ -39,8 +39,6 @@ const unsigned N5 = sizeof(A5) / sizeof(bool);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<bool>  vec_type;
   typedef vec_type::iterator iterator_type;
 
@@ -79,8 +77,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<std::vector<bool> >  vec_type;
   typedef vec_type::iterator          iterator_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/1.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/1.cc
index 68a6c5a..335d907 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/1.cc
@@ -121,8 +121,6 @@ const unsigned N9 = sizeof(A9) / sizeof(bool);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<bool>  vec_type;
 
   vec_type v;
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 fd94c78..f6ebd02 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
@@ -49,7 +49,6 @@ check_cap_eq_maxsize(const std::vector<bool>& x)
 // libstdc++/31370
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   int myexit = 0;
 
   try
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/1.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/1.cc
index b2cbcaa..0e917e5 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/1.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef __gnu_test::uneq_allocator<bool> my_alloc;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/2.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/2.cc
index b4b46bb..4ffabc8 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/swap/2.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef __gnu_test::uneq_allocator<bool> my_alloc;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/swap.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/swap.cc
index 852c80e..316d8df 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/swap.cc
@@ -36,8 +36,6 @@ template<class Cont>
   void
   my_compare(const Cont& c1, const Cont& c2)
   {
-    bool test __attribute__((unused)) = true;
-
     VERIFY( c1.size() == c2.size() );
 
     for (std::size_t i = 0; i < c1.size(); ++i)
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/1.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/1.cc
index 0d0b067..9fe5ea5 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/1.cc
@@ -33,7 +33,6 @@ struct B { };
 void test01()
 {
   // non POD types
-  bool test __attribute__((unused)) = true;
   std::vector< A<B> > vec01;
   typedef std::vector< A<B> >::size_type size_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/2.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/2.cc
index 2475643..7544a45 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/2.cc
@@ -36,7 +36,6 @@ using __gnu_test::destructor;
 void
 test_reserve()
 {
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -66,7 +65,6 @@ test_reserve()
 void
 test_reserve_exception_guarantee()
 {
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc
index 7f10278..6d91654 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc
@@ -24,7 +24,6 @@
 // libstdc++/29134
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   vector<int> v;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc
index 49e0190..de1e83b 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc
@@ -23,8 +23,6 @@
 // libstdc++/29134
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int> v;
 
   VERIFY( v.max_size() == v.get_allocator().max_size() );
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/44190.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/44190.cc
index 528e2cc..d317f1b 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/44190.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/44190.cc
@@ -23,8 +23,6 @@
 // libstdc++/44190
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int> v;
   v.resize(10);
   VERIFY( v.size() <= v.capacity() );
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/8230.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/8230.cc
index 10b370b..d770e1c 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/8230.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/8230.cc
@@ -28,7 +28,7 @@
 // libstdc++/8230
 void test02()
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   {
     std::vector<int>  array;
     const std::size_t size = array.max_size();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/reserve/moveable.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/reserve/moveable.cc
index 7b39b53..827b29f 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/reserve/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/reserve/moveable.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_test;
 
   std::vector<copycounter> a(40);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/reserve/moveable2.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/reserve/moveable2.cc
index cd18303..d317c9e 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/reserve/moveable2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/reserve/moveable2.cc
@@ -26,7 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_test;
 
   std::vector<throwing_move_constructor> v(5);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/1.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/1.cc
index f57442b..1d424bf 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/1.cc
@@ -30,7 +30,7 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
+  bool test = true;
   std::vector<int> v;
   try
     {
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/moveable.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/moveable.cc
index 8a6a81c..f3282fb 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/moveable.cc
@@ -26,8 +26,6 @@ using namespace __gnu_test;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<copycounter> a;
   copycounter::copycount = 0;
   a.resize(10);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/moveable2.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/moveable2.cc
index 04b90aa..dce7548 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/moveable2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/moveable2.cc
@@ -26,7 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_test;
 
   std::vector<throwing_move_constructor> v(5);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/resize_size.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/resize_size.cc
index ac998c0..fb72151 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/resize_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/resize/resize_size.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<__gnu_test::NonCopyConstructible> v;
   VERIFY( std::distance(v.begin(), v.end()) == 0 );
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc
index 4c60032..9c8e968 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc
@@ -25,8 +25,6 @@
 // libstdc++/42573
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int> v(100);
   v.push_back(1);
   v.push_back(1);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit2.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit2.cc
index c5d4c01..aba249a 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit2.cc
@@ -25,8 +25,6 @@ using __gnu_test::propagating_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef propagating_allocator<int, true> alloc_type;
   alloc_type alloc(5);
 
@@ -40,8 +38,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef propagating_allocator<int, false> alloc_type;
   alloc_type alloc(5);
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/3.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/3.cc
index 628b250..e327b5e 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/3.cc
@@ -28,7 +28,6 @@
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
   const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
   const int B[] = {7, 7, 7, 7, 7};
   const int N = sizeof(A) / sizeof(int);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/4.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/4.cc
index af4ef03..06604bc 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/4.cc
@@ -39,7 +39,6 @@ void
 test_default_ctor_exception_gurantee()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -72,7 +71,6 @@ void
 test_copy_ctor_exception_gurantee()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -111,7 +109,6 @@ void
 test_assignment_operator_1()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -139,7 +136,6 @@ void
 test_assignment_operator_2()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -169,7 +165,6 @@ void
 test_assignment_operator_3()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -199,7 +194,6 @@ void
 test_assignment_operator_3_exception_guarantee()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -244,7 +238,6 @@ void
 test_fill_assign_1()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -272,7 +265,6 @@ void
 test_fill_assign_2()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -306,7 +298,6 @@ void
 test_fill_assign_3()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -341,7 +332,6 @@ void
 test_fill_assign_3_exception_guarantee()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -386,7 +376,6 @@ void
 test_fill_assign_4()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -430,7 +419,6 @@ void
 test_range_assign_2()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -460,7 +448,6 @@ void
 test_range_assign_3()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -492,7 +479,6 @@ void
 test_range_assign_4()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
@@ -525,7 +511,6 @@ void
 test_range_assign_4_exception_guarantee()
 {
   // setup
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
   typedef std::vector<T, tracker_allocator<T> > X;
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/cons_size.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/cons_size.cc
index 97e385a..0a5c17e 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/cons_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/cons_size.cc
@@ -25,8 +25,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<__gnu_test::NonCopyConstructible> v(1000);
   VERIFY( std::distance(v.begin(), v.end()) == 1000 );
   for(auto it = v.begin(); it != v.end(); ++it)
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/moveable.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/moveable.cc
index b53aca1..9dee73f 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/moveable.cc
@@ -28,8 +28,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int> a,b;
   a.push_back(1);
   b = std::move(a);
@@ -42,8 +40,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
-  
   std::vector<bool> a,b;
   a.push_back(1);
   b = std::move(a);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/data_access/1.cc b/libstdc++-v3/testsuite/23_containers/vector/data_access/1.cc
index 4a8dd52..2f7e24b 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/data_access/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/data_access/1.cc
@@ -22,8 +22,7 @@
 
 // libstdc++/23578
 void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
+{
   typedef std::vector<int> vector_type;
 
   {
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/debug_functions.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/debug_functions.cc
index 9ab1f25..62df713 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/debug_functions.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/debug_functions.cc
@@ -22,7 +22,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_debug;
 
   std::vector<int> v1(3, 1);
@@ -45,7 +44,6 @@ void test01()
 
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_debug;
 
   std::vector<int> v1(3, 1);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/move_assign_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/move_assign_neg.cc
index 775b562..89f5e7e 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/move_assign_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/move_assign_neg.cc
@@ -24,8 +24,6 @@
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_test::propagating_allocator<int, false> alloc_type;
   typedef __gnu_debug::vector<int, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/move_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/move_neg.cc
index fe9c4b8..4722e5d 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/move_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/move_neg.cc
@@ -26,8 +26,6 @@ using __gnu_test::uneq_allocator;
 
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef uneq_allocator<int> alloc_type;
   typedef __gnu_debug::vector<int, alloc_type> test_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/multithreaded_swap.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/multithreaded_swap.cc
index e45557e..c9c3909 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/multithreaded_swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/multithreaded_swap.cc
@@ -46,7 +46,6 @@ get_index(std::vector<int>& v)
 void test01()
 {
   using namespace std;
-  bool test __attribute__((unused)) = true;
   vector<int> v1, v2;
   vector<shared_ptr<vector<int> > > vs;
   vector<int> *pv3 = 0, *pv4 = 0;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/element_access/1.cc b/libstdc++-v3/testsuite/23_containers/vector/element_access/1.cc
index 7f3a308..a9d28c0 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/element_access/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/element_access/1.cc
@@ -30,9 +30,8 @@ struct A { };
 struct B { };
 
 // http://gcc.gnu.org/ml/libstdc++/2000-09/msg00002.html
-bool test01()
+void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::vector< A<B> > vec01;
   std::vector< A<B> > vec02(5);
   typedef std::vector< A<B> >::size_type size_type;
@@ -51,7 +50,6 @@ bool test01()
     {
       VERIFY( false );
     }
-  return test;
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/citerators.cc b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/citerators.cc
index 2080434..b476b50 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/citerators.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/citerators.cc
@@ -27,8 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<int, __gnu_cxx::_ExtPtr_allocator<int> > v(7);
   VERIFY( v.cbegin() == v.begin() );
   VERIFY( v.cend() == v.end() );
diff --git a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/data_access.cc b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/data_access.cc
index f606e90..d7ba24f 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/data_access.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/data_access.cc
@@ -24,8 +24,7 @@
 
 // libstdc++/23578
 void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
+{
   typedef std::vector<int, __gnu_cxx::_ExtPtr_allocator<int> > vector_type;
 
   {
diff --git a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/element.cc b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/element.cc
index 1f9d69f..74f1127 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/element.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/element.cc
@@ -26,8 +26,6 @@
 // General tests element access and manipulation
 void test01() 
 {
-  bool test __attribute__((unused)) = true;
-
   int A[] = { 0, 1, 2, 3, 4 };
   __gnu_cxx::_ExtPtr_allocator<int> alloc;
   std::vector<int,__gnu_cxx::_ExtPtr_allocator<int> > mv( A, A+5, alloc );
diff --git a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/erase.cc b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/erase.cc
index e928ac7..608d62c 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/erase.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/erase.cc
@@ -40,8 +40,6 @@ const unsigned int N5 = sizeof(A5) / sizeof(int);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<int,__gnu_cxx::_ExtPtr_allocator<int> >  vec_type;
   typedef vec_type::iterator iterator_type;
 
@@ -80,8 +78,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef __gnu_cxx::_ExtPtr_allocator<int> int_alloc_type;
   typedef __gnu_cxx::_ExtPtr_allocator< std::vector<int, int_alloc_type> > vec_alloc_type;
   typedef std::vector<std::vector<int, int_alloc_type >,vec_alloc_type>  vec_type; 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/insert.cc b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/insert.cc
index cc82c97..45a6466 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/insert.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/modifiers/insert.cc
@@ -25,8 +25,6 @@
 
 void test01() 
 { 
-  bool test __attribute__((unused)) = true;
-
   __gnu_cxx::_ExtPtr_allocator<int> alloc;
   std::vector<int, __gnu_cxx::_ExtPtr_allocator<int> > iv(alloc);
   VERIFY( iv.get_allocator() == alloc );
diff --git a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/resize.cc b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/resize.cc
index b59de57..889a596 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/resize.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/ext_pointer/resize.cc
@@ -27,8 +27,6 @@
 void test01()
 {
   // non POD types
-  bool test __attribute__((unused)) = true;
-  
   std::vector<int, __gnu_cxx::_ExtPtr_allocator<int> > vec01;
   typedef std::vector<int, __gnu_cxx::_ExtPtr_allocator<int> >::size_type size_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/1.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/1.cc
index 5ead788..cfa3581 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/1.cc
@@ -22,8 +22,6 @@
 #include <vector>
 #include "testsuite_hooks.h"
 
-bool test __attribute__((unused)) = true;
-
 template<typename T>
   struct A { };
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/2.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/2.cc
index 5d3a551..2417d87 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/2.cc
@@ -22,8 +22,6 @@
 #include <vector>
 #include "testsuite_hooks.h"
 
-bool test __attribute__((unused)) = true;
-
 // test the assign() function
 void
 test03()
@@ -33,7 +31,6 @@ test03()
   const int B[] = {K, K, K, K, K};
   const std::size_t N = sizeof(A) / sizeof(int);
   const std::size_t M = sizeof(B) / sizeof(int);
-  bool test __attribute__((unused)) = true;
 
   // assign from pointer range
   std::vector<int> v3;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/self_emplace.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/self_emplace.cc
index 4f7455e..83ed695 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/self_emplace.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/self_emplace.cc
@@ -20,8 +20,6 @@
 #include <vector>
 #include "testsuite_hooks.h"
 
-bool test __attribute__((unused)) = true;
-
 void
 test01()
 {
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/erase/1.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/erase/1.cc
index 285a1b1..21f2865 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/erase/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/erase/1.cc
@@ -38,8 +38,6 @@ const unsigned int N5 = sizeof(A5) / sizeof(int);
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<int>   vec_type;
   typedef vec_type::iterator iterator_type;
 
@@ -78,8 +76,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   typedef std::vector<std::vector<int> >   vec_type;
   typedef vec_type::iterator          iterator_type;
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/erase/moveable.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/erase/moveable.cc
index 33e3607..e28f806 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/erase/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/erase/moveable.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_test;
 
   std::vector<copycounter> a(40);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/1.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/1.cc
index ebc80c8..5743a64 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/1.cc
@@ -23,7 +23,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   vector<int> iv;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/self_insert.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/self_insert.cc
index 08e01e7..d6aa810 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/self_insert.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/insert/self_insert.cc
@@ -21,8 +21,6 @@
 
 #include "testsuite_hooks.h"
 
-bool test __attribute__((unused)) = true;
-
 void test01()
 {
   std::vector<std::vector<int>> vv =
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable.cc
index 1d79b3e..9c11c27 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable.cc
@@ -28,8 +28,6 @@ using namespace __gnu_test;
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<copycounter> a;
   copycounter c(1);
   copycounter::copycount = 0;
@@ -51,8 +49,6 @@ test01()
 void
 test02()
 {
-  bool test __attribute__((unused)) = true;
-
   copycounter c(1);
   std::vector<copycounter> a(10, c), b(100, c);
   copycounter::copycount = 0;
@@ -69,8 +65,6 @@ test02()
 void
 test03()
 {
-  bool test __attribute__((unused)) = true;
-  
   copycounter c(1);
   std::vector<copycounter> a(10, c), b(100, c);
   copycounter::copycount = 0;
@@ -89,8 +83,6 @@ test03()
 void
 test04()
 {
-  bool test __attribute__((unused)) = true;
-
   copycounter c(1);
   std::vector<copycounter> a(10, c);
   copycounter::copycount = 0;
@@ -107,8 +99,6 @@ test04()
 void
 test05()
 {
-  bool test __attribute__((unused)) = true;
-
   copycounter c(1);
   std::vector<copycounter> a(10, c);
   copycounter::copycount = 0;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable2.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable2.cc
index 12ae0db..344dcd6 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/moveable2.cc
@@ -26,7 +26,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace __gnu_test;
 
   std::vector<throwing_move_constructor> v1;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/push_back/49836.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/push_back/49836.cc
index b80e679..1bc3ab7 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/push_back/49836.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/push_back/49836.cc
@@ -24,7 +24,6 @@
 // libstdc++/49836
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   using __gnu_test::CopyConsOnlyType;
   using __gnu_test::MoveConsOnlyType;
 
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/1.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/1.cc
index b0c9d7c..e77efb6 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/1.cc
@@ -33,7 +33,6 @@ namespace std
 // Should use vector specialization for swap.
 void test01()
 {
-  bool test __attribute__((unused)) = true;
   std::vector<T> A;
   std::vector<T> B;
   swap_calls = 0;
@@ -44,7 +43,6 @@ void test01()
 // Should use vector specialization for swap.
 void test02()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
   vector<T> A;
   vector<T> B;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/2.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/2.cc
index 091952d..5a753c6 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/2.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/3.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/3.cc
index 6d5ea98..61348af 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap/3.cc
@@ -27,7 +27,6 @@
 void
 test01()
 {
-  bool test __attribute__((unused)) = true;
   using namespace std;
 
   typedef __gnu_test::uneq_allocator<char> my_alloc;
diff --git a/libstdc++-v3/testsuite/23_containers/vector/zero_sized_allocations.cc b/libstdc++-v3/testsuite/23_containers/vector/zero_sized_allocations.cc
index 74fa95c..272caf3 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/zero_sized_allocations.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/zero_sized_allocations.cc
@@ -56,8 +56,6 @@ void operator delete(void *ptr, std::size_t) throw()
 // http://gcc.gnu.org/ml/libstdc++/2007-09/msg00006.html
 void test01()
 {
-  bool test __attribute__((unused)) = true;
-
   std::vector<std::vector<int> > *v;
   VERIFY( zero_sized_news == 0 );