From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 17 Oct 2016 13:32:32 +0000 (+0000)
Subject: 57619.C: Rename to 57619.cc.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a9260b7eb688df43a724e25421ba40f35a89fee9;p=gcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 31280a36acf..98872fd6b4c 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 a248437c543..5e2238f2d70 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 fdfbb90209e..76f4fb99e3b 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 a070d967858..c53e1207ee8 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 4df3df9a009..2337410fe05 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 25d96ed6973..aec584273f4 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 e2f3dc29de9..d76fab6288a 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 965466713b8..06b973bfaf3 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 5075927fc55..7285358f0f4 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 874ff0ee41b..b186acc371a 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 f8ce419e7f5..77c46fedb0e 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 e85255c52e8..c2dac6fe28f 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 457dd9c4a17..d82fd8eb8e3 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 d6413132f48..59ec682d5a4 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 bb7f964a050..d00d0169967 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 a24fc6cef90..d3eb094fadc 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 7292feca242..55e875372b1 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 d11537a6344..ca0c1c784f7 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 d7881d1977a..fd269807e65 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 6371e10728e..5cf3ac43eca 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 9fe5b80c071..cc17239fc7f 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 8f3e7c6c1e6..0bc339119d5 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 3e081dce27d..861c41085c5 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 33ad01cbc01..f79febce09d 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 c59721bc6de..b9873202070 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 672935bb13b..2217152994d 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 1d5b3806164..470c139ded8 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 d5cd9a09599..5985053044d 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 982565831fe..c60763eac81 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 f145a8437ae..ee9118da112 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 052a717b795..15cdd8483ef 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 02f648a5a10..3b80d212377 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 cd07a8cec5c..7d4403951bb 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 e7191580fab..700e339390a 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 e8531ea3de9..28d1a271453 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 631bc3232e2..160ce167571 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 a8427db2d6a..b87297cb4b0 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 16a1161187f..19978fd9073 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 ee4256b57f2..0637f39ac42 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 84af293656b..f2bdbe65117 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 9201bc774e9..fed5564d912 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 baffa14f8f6..51b22cf24f8 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 cda9167a8d9..7f81299e259 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 b7ce4d3afb6..69a1edac611 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 001f8a88f59..09387b19e67 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 a8fd1ba412d..e1d13fa239d 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 709f6dcb963..9f0ccf4c577 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 668d517e790..d525d68f367 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 f554210d3c0..e667b0df69d 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 c8911721ddf..2f0a1a0df4d 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 3bb7c2a50e5..c59895707f9 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 c10ef52b3c2..1e7a1c896f8 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 d94073071da..320fa4fe9b9 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 0d2eb2a37b2..d1273da3a9d 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 3137b70a357..0f0703e4f2d 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 12480785b2e..73110ed7363 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 d94677e1c02..5eacacec002 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 fb4226e5ce0..215af713b6f 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 c2d8e63de72..680c076d663 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 6779ce1f50b..551a3d9f35e 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 e16f260f168..20a64f092bc 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 c2075f3889a..a2e4dbfa0d4 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 912b2fc7c39..07aaee732d7 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 9bfd306057f..695b4e30a5d 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 7cee6f02de3..dd706aa0bbc 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 d40610d5a07..74bbdbf96b1 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 44cf03dc08e..8139ce47b5e 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 6b2bdd3881a..a873914b5bf 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 c9600ccc394..f7c2a9e6798 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 aa2e21575da..e07fc4c2f2e 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 341421c1f75..b55325207e0 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 bef3da4ee3c..45653a62802 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 fbf24cddf7d..83e8abe1689 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 ee39149c29c..30250f9d215 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 c164a6ad73b..ddda769b92c 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 3d5ac411510..e280fe875f7 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 554c9b01eb9..39ec8ae23fd 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 e4fbbb2b9b6..098c7023b4e 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 9436438f846..499433e51b9 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 79b47dafa07..f5edcdc3747 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 99f30fa0dc4..6e3d9bc03bf 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 7e7663b3dbc..1c4b3bc1ac0 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 7879de8c41b..415e3f80bc7 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 10897645ddf..657bdfb4497 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 d862130611b..a9df8b85c06 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 a3524bbf2ee..25287fe2fcb 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 8721444ca92..8f2f1a98051 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 cbfea664d43..73562997f08 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 430bf90747f..ba891e6e6e2 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 9c8eefb18b6..aa1049d4b77 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 99a7a976c69..e76c8e29ca0 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 931534dbd63..b20aced65cc 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 74ee4fbc02e..e28e84929e6 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 2b35f39434b..fde79205b32 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 3ccd0c0179b..9f7098eae01 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 ae90415d5d8..51a52ca992b 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 fd0fbb7e3df..09b52df6dcc 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 0073b11a597..b36c7527f98 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 295f203bde5..1795a52cfb7 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 d5beb0e77d6..20430a9319c 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 9446fce66ca..91698a6c2eb 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 3e31bbc29ec..c0a6c4c9f30 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 e2d1ce772f5..a729b8d8ecb 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 498c735dc38..1998c54a4a4 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 3a0632448d9..0459173894e 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 13f502cfbab..015583bbe6c 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 790d524fae9..5628522a9c0 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 0d7d24c23e3..6e08f87bb3f 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 80cbe1575ab..6d4459c690d 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 b894e7a751c..f5d62aa514b 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 6874ba148f4..19a04419b96 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 3d22607cfb8..1e456d43d99 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 02931cd4bcd..0f75ba2377d 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 0bbd973e41f..07b73825a42 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 35798156ee2..1fa70b54693 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 0058923ac7c..8551ef5256c 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 13d518a1fe1..1e297865540 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 7038793fd24..3b4fb8f4374 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 7556fd941ad..79fc01b986b 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 81bee4ec736..98c988f3015 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 e7ca4456cad..5cf0deb445a 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 fa0c9e8be36..718731f9359 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 33e6b0ce807..9d5756324e2 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 54ce84cdf7f..8abbeb49235 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 9e9ca5792b3..063668675e4 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 d700d924347..95b86309cdb 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 196e6131c07..091385bc0d8 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 b5d810c6be8..40457dd4286 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 2ff6d673d05..db1cac5efeb 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 b1d507df24e..a88baa528e0 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 54141f728fc..fef2deadfcb 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 e737c7eb838..b51345312b1 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 54964c49ace..aefd0f61710 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 faa487158d3..a707e75f941 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 cd1aee0d276..32eff630c51 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 5d0a9970b09..19448e976d6 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 74c8b7ea33f..932b1a36f43 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 c00c9bd1169..92dd30a1d85 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 5c7031a867e..161e6e23831 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 cda7326902c..b86221dcfd6 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 21ac2ae0e24..4f0b73a23af 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 fd228a9ce4b..85e9b524aab 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 4c1f2a0f6b5..a1d62a6dcd3 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 780d63208f5..809cd86aaf4 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 42edb401f03..1a85c1c18b7 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 1d67929db0e..5845271ab1f 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 bb8c52998d0..a7841f9dba4 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 624bc34d5a8..d9d557abfe1 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 2a9427b471b..9d4dd6a91d8 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 2868d72ae3f..4bcced53f80 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 6a1c3442e76..208c8e2f1ea 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 75862cedc93..9d7acd4e0aa 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 1555e0e1139..ad174cbd5ec 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 dbcb1fad25d..46fc93d8486 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 3b50b302686..22a0b19034b 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 43045bfc193..fb866588440 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 465ce4faf56..296d7d4969b 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 421a068edc0..da7bfda41ca 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 f83372d4d27..ce136b8e972 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 52785c00f10..0d7a82be91b 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 2987974dff0..7918fedcb0c 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 51133c49464..9be8c0281f2 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 86ae0e898bf..bb79b477a73 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 aca4d311241..f909af5f3e7 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 0811f365319..6a1ec501787 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 e107379fc01..5762cfe75f2 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 60680b0f4a8..b2a944fc9fc 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 abe9cbc77aa..2cc93f3deb8 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 ce46fc8c4e9..f48bf89151c 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 5738d9c69fd..760090e369f 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 dbbcc803ba7..7622e482c60 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 6db8a868078..2bc1b47ec4f 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 0f6076a6906..77f59dd60d4 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 99e3daac823..807e3f9c0ad 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 1bb504859e6..b2735884c51 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 6c5b9943f9a..33a114410bf 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 40b8cadeaeb..1c1d3ec9ed5 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 9db533bb0da..bcce8ea8475 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 c978ed21e07..cc8da8fc5c7 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 9bbf2dd21c0..52c49224c6d 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 2f55eefb4ad..51b46b53f62 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 02e5ee810cd..c3616df61a2 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 68665c5778d..9ea877055c1 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 bdb66996089..e172fc7ce9f 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 359fd1b73e1..ef226b6cc37 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 6af182ee406..d524f641092 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 2236ceff9f4..fdc5bad2aa0 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 658e4a0e97b..4b30945e9d9 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 e8022f8cf7a..6028c04ee7f 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 0c21b7c245f..b9116b0d16a 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 528347d6a94..7da6ac8cefd 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 c1f3e746616..4f311ea2977 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 b6b7586f5da..e1e051d8591 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 7d1891e5777..4f786bd6828 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 22002e16a25..6e9953b10a0 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 07c059292e3..411faa8905a 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 a17e61d761d..5a3212411d6 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 da8bd363442..ec117c5d68f 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 525b80e233e..d376b214939 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 341da84b745..c2ce1c307ac 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 10d1404a7ca..f015227bf67 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 6f2d0a8a029..5378bb69f27 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 cad131ceadf..ec11aee493d 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 9c9c25d0e4c..7d605e28735 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 632207d2942..ed88fef35d8 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 e0f68abce6a..6e216857826 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 dda817c001d..f18575e644d 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 690d88efab5..470e9d2a1d0 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 70541ff7fbe..2cc8b2a5610 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 7ba71b62ebd..b664e1e8e9d 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 d9058cd0bea..6d96f5e7a8e 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 0b6d3a854dc..eafc5c8e1f9 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 281a7fd6d68..51a5ae8e123 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 0238e1e5593..d5ee57d18b5 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 dfa2d571d84..32cece0ebac 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 1f981719455..3e63a0dbee5 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 f0b0b20a45d..0e7c5647c0e 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 cb284e7640f..7f25f5fcbce 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 c37dcb89a0c..37b922b8b73 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 a03e911f2c8..be68af0344a 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 ebcde055709..3172a0c3a5d 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 594c3348ae2..2a8ab0b9602 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 b23d02b73cf..848c0e44a6f 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 859c2169072..3adbb703b1c 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 ef630f7d561..6f9c18570d2 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 154c1e23814..5e7d3574d39 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 7ea591dd7fb..19d646c3ec8 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 0442d239abc..2f7d08be12f 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 3cd567663bb..d7dbdfa2def 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 17ae625cbcd..7a84bf90444 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 56c2a286f45..5f15feb02bc 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 400a2bc7369..d2992f32882 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 08c08e4c410..531eb0724b6 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 37b1c1f30ce..c96ae9f15c0 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 d0bc2133ca8..0aca1875354 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 d6f79562909..0c3ad781012 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 ba422b889c4..f4a1f44f430 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 97d9ad12a50..b8c8feeb0f6 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 9d2400fa9ea..52b29a2ccf0 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 76566940725..f81cfb4e940 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 6eeaa307ee0..646ea0a6175 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 024715a37ac..869ccb7147c 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 a60e5e21c35..1912d2af40e 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 59d943929f0..929b88134f5 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 51ffad855e1..b3db5c21b46 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 01d3050b26b..d522bf4a268 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 ed44a99c51c..d5e093b521b 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 a6ababae8ec..f28cf4e93e1 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 fecbfcb0550..2545e55ff9b 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 09c5f26f092..60c0835b026 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 471f726dd24..e9fc18f964a 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 f5e65be7c82..0c5c5ae114d 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 4f421a2a414..29cf909bd45 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 0d42b9ddf44..095219e912a 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 1f95c94d808..2787bdf3bc7 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 33ce5e726a0..1bf9768d2c2 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 6d6501ce660..3388c178cc9 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 be2df5d3b89..f2f1cade5bd 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 0208e877c6f..e5ab1309f7d 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 1fd6433f1a6..438dddd526e 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 6f829bdec80..739e1c22e51 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 db5872a499a..d70ad27ce31 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 d9264a8e9f7..28141053c21 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 18274239e24..001ce7be4bb 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 b3c1adb0e0e..bcb0113bb90 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 b1e06937b64..85c1186e87d 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 e3b5ccab6e6..4f14e3e4e5f 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 8c97a778fab..39583789939 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 e6fc1e17488..5dfa2b675a2 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 24099046bb7..ad393f2fee5 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 e9d6da87a45..5ff15ab3fe9 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 7c9c9526d3c..9d9c8080343 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 9c86f277b5c..cdad2760b8e 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 1946c016f2e..434c09719d2 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 6f48873ceb1..1efc6ebee87 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 215c08f4d71..ca8fee13bd9 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 000c969970b..a399dd1a616 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 07beef43439..cfbe09ce5d4 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 2b2d6fdcefd..d42f1c02f0e 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 b72f49a8448..eae800c98da 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 60a821e8346..321777b19c8 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 1b00460328b..0cca6ea6e33 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 bc132f12abe..9307e28728b 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 6d7b4200964..84e12f0b1a6 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 cdb99adc5be..fab22acf3f7 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 580b27704b1..f665fdd207f 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 6209e19ca69..344112abee3 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 79105750946..04342a982cb 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 80f85821c90..1e0495203e7 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.C
deleted file mode 100644
index 8fff3d40884..00000000000
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.C
+++ /dev/null
@@ -1,51 +0,0 @@
-// { dg-do run { target c++11 } }
-//
-// Copyright (C) 2013-2016 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <unordered_map>
-#include <string>
-#include <testsuite_hooks.h>
-
-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"),
-	                                       std::string("value")};
-    mymap.insert(mypair);
-
-    VERIFY( mypair.first.length() && mypair.second.length() );
-  }
-
-  {
-    std::unordered_map<std::string, std::string> mymap;
-    std::pair<std::string, std::string> mypair{std::string("key"),
-	                                       std::string("value")};
-    mymap.insert(mymap.begin(), mypair);
-
-    VERIFY( mypair.first.length() && mypair.second.length() );
-  }
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.cc
new file mode 100644
index 00000000000..921b8f4c30c
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/insert/57619.cc
@@ -0,0 +1,49 @@
+// { dg-do run { target c++11 } }
+//
+// Copyright (C) 2013-2016 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <unordered_map>
+#include <string>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  {
+    std::unordered_map<std::string, std::string> mymap;
+    std::pair<std::string, std::string> mypair{std::string("key"),
+	                                       std::string("value")};
+    mymap.insert(mypair);
+
+    VERIFY( mypair.first.length() && mypair.second.length() );
+  }
+
+  {
+    std::unordered_map<std::string, std::string> mymap;
+    std::pair<std::string, std::string> mypair{std::string("key"),
+	                                       std::string("value")};
+    mymap.insert(mymap.begin(), mypair);
+
+    VERIFY( mypair.first.length() && mypair.second.length() );
+  }
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
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 c7c6d045a43..86cdee5e7e1 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 d681a88075c..f7b1c45aead 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 d4e099eab96..a89400ffe3d 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 08d4cd377fe..eee277cb4ee 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 dd0f612ce42..809f7bf24d3 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 4d8c36c7661..952a7f2a139 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 db44dc04286..bf2e733ff8d 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 3c22236109d..0027171d990 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 9d9c43ef905..24609aef56f 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 2ff624dd18d..4a64398f78c 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 f0035d2eb84..e4350459f62 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 71d91863722..1d1ced9424f 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 4fadb247ecb..5887968a8bb 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 b9805c0397b..6c1f47f48a2 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 877e88db092..ecda9f2e922 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 fd95b043ce8..0126834d43a 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 a17be439a96..3253b64d0b0 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 ea675083503..0f8e2675d5a 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 ad3f752e716..8a4151c2744 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 7edec34111e..ef5ed553fdb 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 4ea55b49f4a..6b3ca967244 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 1d58624d74d..c21b64f9bfb 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 3c5c6a82183..9c0e854de7b 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 0c3c50b1d79..237d1be4a73 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 7320a90df92..ab75592ebe8 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 5db854c1d3c..3bb3cf0f24a 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 521fbee9f46..6b9a2981c74 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 f93138b2b36..4ab5884382e 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 c7f05c6225a..80a5e7bb863 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 4a4fdb0beac..8469fd3977e 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 a3492f808ff..694db25324d 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 0eb61ffa624..3db89b7c19d 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 c1d0fee54b3..51f3db9dc4f 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 4134c1920be..902352cb819 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 ff4b8e0afc4..b040cc0aa48 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 3eefb221165..d91f7eeba15 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 b305ff23257..9fc6fd3b1c3 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.C
deleted file mode 100644
index 85e8610a1be..00000000000
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.C
+++ /dev/null
@@ -1,51 +0,0 @@
-// { dg-do run { target c++11 } }
-//
-// Copyright (C) 2013-2016 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <unordered_map>
-#include <string>
-#include <testsuite_hooks.h>
-
-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"),
-	                                       std::string("value")};
-    mymmap.insert(mypair);
-
-    VERIFY( mypair.first.length() && mypair.second.length() );
-  }
-
-  {
-    std::unordered_multimap<std::string, std::string> mymmap;
-    std::pair<std::string, std::string> mypair{std::string("key"),
-	                                       std::string("value")};
-    mymmap.insert(mymmap.begin(), mypair);
-
-    VERIFY( mypair.first.length() && mypair.second.length() );
-  }
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.cc
new file mode 100644
index 00000000000..002f64eaae9
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/57619.cc
@@ -0,0 +1,49 @@
+// { dg-do run { target c++11 } }
+//
+// Copyright (C) 2013-2016 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <unordered_map>
+#include <string>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  {
+    std::unordered_multimap<std::string, std::string> mymmap;
+    std::pair<std::string, std::string> mypair{std::string("key"),
+	                                       std::string("value")};
+    mymmap.insert(mypair);
+
+    VERIFY( mypair.first.length() && mypair.second.length() );
+  }
+
+  {
+    std::unordered_multimap<std::string, std::string> mymmap;
+    std::pair<std::string, std::string> mypair{std::string("key"),
+	                                       std::string("value")};
+    mymmap.insert(mymmap.begin(), mypair);
+
+    VERIFY( mypair.first.length() && mypair.second.length() );
+  }
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
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 b70f78800f5..70b99437b5c 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 2cb616f4b82..99f1340daa8 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 576d8b48aee..7750d8f190a 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 48f23d83826..f3b2819eb0c 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 77b00a2d064..56e157c0e37 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 cb4fb98a850..06eddccbffa 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 635e7d0acd3..85b2c99693d 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 3c67e3c28da..ebb8f18fd4b 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 26fdf767244..e79762c4bab 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 6766e0029a6..dec07234b6d 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 87db82de5fa..73162f0bd97 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 ab7e699855a..07a600fc21e 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 2933948d948..611d21239e6 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 8f2089b71fd..8fbd02ed7cf 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 6503469b801..be0321e23f3 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 0339a965446..0e8edd326fc 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 f969a6ec3fb..69e022b8053 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 c6f7728b354..d89165da073 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 cfa08c7941d..2f233f2843b 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 cb9d2cf4420..1219517cca7 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 5e1a4a68a45..2576e9627a5 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 410f7c1ad2a..6d1fc4a1573 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 e0670e68f62..65e8dc34a37 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 2fefa0f4d43..238db49fa29 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 625cb469383..f76ccfa89a8 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 fc0a4e58afd..ed8445b117e 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 eb3c04ebdff..55ce8806c92 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 47327a73381..3f1458826ea 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 1aa30902d55..ac58f2985bc 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 5352a0be733..7c8dfda3a76 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 fbbf42e8104..6c10504a57c 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 bc44e4b5474..0085ee9e37a 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 b318a9c5a30..97a76f6136a 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 91ee6c49162..496df5de589 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 6e1a1c176e8..f2abcf735f6 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 4527987a31e..17e5e9618ee 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 c9091ab2c6c..d9163345077 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 e703dc41ca0..4b7414078f9 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 4ce4b84d717..4c2569c8f19 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 c8b8065b6cd..9f5afb4780b 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 c7013ad2924..9f4fb9b7f0f 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 765995f040e..1a3a4b094fb 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 99629080a47..d7998b0fbb3 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 601e4a62c72..c7ec616c51a 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 e1f0746e31a..dba651eb0a8 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 a3b8b41fb27..e0e2864655e 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 8b96330ed48..4ba9667fec1 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 c15abfbc2e1..f0b420b3835 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 b7996c6f252..992ca05cd7e 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 68e314b8f0b..a6e02262f83 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 f01328cb3c0..1c18588e8d1 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 4c95ae3a3b9..a5c7dc460d6 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 6a45c437bc1..fe918fd08dc 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 6ed3adb095e..3dd4b361508 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 6b3fd6da399..8cd5aebaf1f 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 3a25de721d1..84f00bc86e7 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 33f21880aa3..65bd7608e8e 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 e743fbaaab7..0fae199e4f8 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 331c71359a5..d6465d35c33 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 2f320b8e87b..03d9b141e17 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 b6e66ec7225..c54b07bdba8 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 c388b701295..d815291a8cf 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 e5e15315cdb..a653b104df3 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 f1b5920148c..b6d986259b3 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 2e9cc09e8cf..9f956f4a3be 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 497cf4ce1c8..30b472d7122 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 694e6a6c93e..78bdaa38ed2 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 caed770cd64..c4a605749df 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 3ef16fc1862..cbeb9c01760 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 9d3758ac133..d3801c2c215 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 470050e1563..4cf76473a6f 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 45611e41e56..794ae0e9c18 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 8fbbb1bfea9..e3ce2b5e70a 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 cb48cbcef4e..a06835aed6a 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 29387dd21f6..81784109241 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 ae4333fd443..732e14997e4 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 d205d683997..2c493e3e22b 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 1fb685c0f68..1450b74e57a 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 1cfb3b7fc5b..eb0cac520a9 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 2a96196f5ab..098f6e4c4e2 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 6e10c19896c..76b05000712 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 c7740749044..605b1f7aca0 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 16310dd5294..bccd59303f5 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 c9cf806972f..1a79362592d 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 84438576510..ba8f7c87675 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 57bbdda46eb..30532f2e6ea 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 f8bdecc03aa..55e8fd6da36 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 7bd8b396efd..d5f3e6587b8 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 c961f0cd048..62b808f7ef5 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 1809a1531bb..9177a8bf9b3 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 940a3b7ab7b..d0c69be3eba 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 177d968798e..a409a1415c2 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 705e151fb72..0354275f77a 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 0840c0b156f..f399525ba31 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 b1b2f37fa26..fc2a5163102 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 c9994e10311..c86e7c3c191 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 62f97915c48..2603507e6ae 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 5cae6d5aff8..a55294b05f5 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 723d2cdda4d..43b546a6720 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 6d17e9b31bc..1281e351684 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 68a6c5add4f..335d9071e77 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 fd94c78407a..f6ebd02b925 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 b2cbcaa3380..0e917e5f592 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 b4b46bbe718..4ffabc89fc1 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 852c80e9edf..316d8dfeff8 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 0d0b067a8c4..9fe5ea530ad 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 2475643f4fc..7544a452db7 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 7f102786946..6d9165482c7 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 49e0190a651..de1e83b6a5e 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 528e2ccbee4..d317f1bf479 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 10b370ba623..d770e1cab58 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 7b39b535cd6..827b29ff3d6 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 cd18303cd71..d317c9e3804 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 f57442b6685..1d424bf6740 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 8a6a81c734f..f3282fb2e92 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 04b90aa7b90..dce75481240 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 ac998c09509..fb72151f63c 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 4c60032c6e9..9c8e968a2cb 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 c5d4c01bef6..aba249ad59f 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 628b250c8b3..e327b5e5260 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 af4ef0392e8..06604bc2e47 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 97e385ab027..0a5c17e7448 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 b53aca1708b..9dee73f211b 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 4a8dd520a4c..2f7e24b3004 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 9ab1f256c6f..62df7135d0d 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 775b5621f15..89f5e7e2ab1 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 fe9c4b8aa50..4722e5d68fd 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 e45557ed933..c9c3909151d 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 7f3a308daa2..a9d28c0ae58 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 208043404d4..b476b50c15b 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 f606e90062e..d7ba24fafe4 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 1f9d69f586e..74f112766bd 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 e928ac76535..608d62c34df 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 cc82c97b6a3..45a64660bfa 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 b59de57cac4..889a59633a7 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 5ead7885783..cfa35816b67 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 5d3a5518cc9..2417d872509 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 4f7455e7ee5..83ed695ae5e 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 285a1b14955..21f28654186 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 33e360708ee..e28f8061784 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 ebc80c88ae3..5743a64f05e 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 08e01e777bd..d6aa8105a20 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 1d79b3e2fec..9c11c27a3a1 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 12ae0dbe614..344dcd6ccc2 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 b80e6791753..1bc3ab73805 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 b0c9d7cb8bb..e77efb6358f 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 091952d76c0..5a753c6397c 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 6d5ea98890b..61348af8a59 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 74fa95cc841..272caf3c793 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 );