summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/utilities
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2019-05-31 18:35:30 +0000
committerMarshall Clow <mclow.lists@gmail.com>2019-05-31 18:35:30 +0000
commit7fc6a55688c816f5fc1a5481ae7af25be7500356 (patch)
treecac80ad839e171aa372cd03df408af1b90125db6 /libcxx/test/std/utilities
parent065bd45da9de57668cfaabe1b851a2e08acea215 (diff)
downloadbcm5719-llvm-7fc6a55688c816f5fc1a5481ae7af25be7500356.tar.gz
bcm5719-llvm-7fc6a55688c816f5fc1a5481ae7af25be7500356.zip
Add include for 'test_macros.h' to all the tests that were missing them. Thanks to Zoe for the (big, but simple) patch. NFC intended.
llvm-svn: 362252
Diffstat (limited to 'libcxx/test/std/utilities')
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/is_always_equal.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/copy_assign.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/move_assign.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/allocator.adaptor/types.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/any/any.class/any.observers/has_value.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/any/any.class/not_literal_type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/charconv/charconv.to.chars/integral.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/PR23141_invoke_not_constexpr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_function_object.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_int_0.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_lvalue.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_rvalue.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_void_0.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/nested.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.isbind/is_bind_expression_03.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bitwise.operations/bit_not.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/comparisons/transparent.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.invoke/invoke.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.memfn/member_data.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.memfn/member_function_const.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.memfn/member_function_const_volatile.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.memfn/member_function_volatile.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.require/binary_function.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.require/unary_function.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.search/func.search.bm/default.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pred.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.search/func.search.bm/pred.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/default.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pred.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/pred.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.search/func.search.default/default.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.search/func.search.default/default.pred.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.badcall/bad_function_call.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/bad_function_call_ctor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/operator_bool.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_incomplete.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/default.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/operator_==.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/types.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/negators/binary_negate.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/negators/not1.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/negators/not2.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/negators/unary_negate.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/ctor.incomplete.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref.incomplete.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref_1.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref_2.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref.incomplete.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_1.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke_int_0.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke_void_0.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/unwrap_ref_decay.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/unwrap_reference.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/refwrap/weak_result.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/intseq/intseq.general/integer_seq.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/allocator.tag/allocator_arg.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/is_always_equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/allocator.traits/allocator_type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/allocator.traits/value_type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/default.allocator/allocator.members/address.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/default.allocator/allocator.members/max_size.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/default.allocator/allocator_void.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/pointer.traits/difference_type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/pointer.traits/element_type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/pointer.traits/pointer.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/constexpr_addressof.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.dynamic.safety/declare_no_pointers.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.dynamic.safety/declare_reachable.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.dynamic.safety/get_pointer_safety.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/eq.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/lt.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.logical/conjunction.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.logical/disjunction.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.logical/negation.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.rel/is_nothrow_convertible.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/enum.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/floating_point.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/function.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_unbounded_array.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/lvalue_ref.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/member_function_pointer.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/member_object_pointer.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/pointer.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/rvalue_ref.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/union.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/void.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.nullops/equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.nullops/greater.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.nullops/less_than.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.dtor/dtor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.mod/reset.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_or_const.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.object/types.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.relops/equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.relops/greater_than.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.relops/less_equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.relops/less_than.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.relops/not_equal.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.specalg/make_optional_explicit.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/optional/optional.syn/optional_includes_initializer_list.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_add.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_divide.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_multiply.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_subtract.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/ratio/ratio.ratio/ratio.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/ratio/typedefs.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.runtime.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.single.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.single.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.runtime.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.single.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/eq.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/rel.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/template.bitset/bitset.members/all.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/template.bitset/bitset.members/any.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/template.bitset/bitset.members/none.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/template.bitset/bitset.members/size.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/template.bitset/bitset.operators/stream_out.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/template.bitset/includes.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/days.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/hours.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/microseconds.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/milliseconds.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/minutes.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/months.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/nanoseconds.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/seconds.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.file/consistency.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.file/rep_signed.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.hires/now.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.steady/now.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.system/consistency.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.system/now.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.duration/default_ratio.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_overflow.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.duration/types.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.point/default_duration.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.point/time.point.cast/floor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.point/time.point.cast/round.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/weeks.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/time/years.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.general/tuple.smartptr.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_extended_types.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_large_arity.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/tuple_array_template_depth.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR22806_constrain_tuple_like_ctor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR23256_constrain_UTypes_ctor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR27684_contains_ref_to_incomplete_type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR31384.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_move.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/dtor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/test_lazy_sfinae.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/tuple_array_template_depth.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple.include.array.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple.include.utility.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_incomplete.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_structured_bindings.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_v.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_value_sfinae.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp1
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.traits/uses_allocator.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.hash/hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.members/ctor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.members/eq.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.members/hash_code.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.members/lt.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.members/name.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.overview/copy_assign.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/type.index/type.index.overview/copy_ctor.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/as_const/as_const.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/operators/rel_ops.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pair.astuple/get_rv.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pair.astuple/tuple_size.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair_cxx03.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second_cxx03.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V_cxx03.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.pair/types.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/pairs/pairs.spec/non_member_swap.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/utility/synopsis.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.helpers/variant_size.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.monostate/monostate.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.synopsis/variant_npos.pass.cpp2
397 files changed, 715 insertions, 0 deletions
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
index 961eda3ac8f..957ceffea30 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
@@ -20,6 +20,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
index d3734cae10e..5328f6b4f8a 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
@@ -20,6 +20,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
index 427e2995788..26dfb257cb2 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
@@ -20,6 +20,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
index 69b767b909e..48843ba1b99 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
index fdf21cec3e0..c3fc9730868 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
index 05a1649e4a6..9bebc4deaed 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
index db9338d31b8..f4aa62fa4bb 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
index 97ae33d9157..5201c5c6cab 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
@@ -19,6 +19,7 @@
#include <cassert>
#include <string>
+#include "test_macros.h"
#include "allocators.h"
struct B
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp
index 7aa45f05add..9748d66fb45 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp
@@ -25,6 +25,8 @@
#include "uses_alloc_types.hpp"
#include "controlled_allocators.hpp"
+#include "test_macros.h"
+
void test_no_inner_alloc()
{
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp
index d1a03bc05fc..103f8f41327 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp
@@ -25,6 +25,8 @@
#include "uses_alloc_types.hpp"
#include "controlled_allocators.hpp"
+#include "test_macros.h"
+
void test_no_inner_alloc()
{
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp
index 14f413bd867..d8f5e7c7879 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp
@@ -26,6 +26,8 @@
#include "uses_alloc_types.hpp"
#include "controlled_allocators.hpp"
+#include "test_macros.h"
+
void test_no_inner_alloc()
{
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp
index c26b4652cc4..5632e2112d9 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp
@@ -25,6 +25,8 @@
#include "uses_alloc_types.hpp"
#include "controlled_allocators.hpp"
+#include "test_macros.h"
+
void test_no_inner_alloc()
{
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp
index 7a4b14956f0..9ba2d155d2a 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp
@@ -25,6 +25,8 @@
#include "uses_alloc_types.hpp"
#include "controlled_allocators.hpp"
+#include "test_macros.h"
+
void test_no_inner_alloc()
{
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp
index e93f37f412e..2dee95d34da 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp
@@ -25,6 +25,8 @@
#include "uses_alloc_types.hpp"
#include "controlled_allocators.hpp"
+#include "test_macros.h"
+
// - If uses_allocator_v<T, inner_allocator_type> is false and
// is_constructible_v<T, Args...> is true, calls
// OUTERMOST_ALLOC_TRAITS(*this)::construct(
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
index 425f00ad4f4..ce37c82e60a 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
index 50c9d24f07d..1d8ca370b19 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
@@ -19,6 +19,7 @@
#include <cassert>
#include <string>
+#include "test_macros.h"
#include "allocators.h"
struct B
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
index 7e73939f8ee..cbe8a7ec6fb 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
@@ -19,6 +19,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
index de9cf4d0cad..5882213f241 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
index 9a90d17c0c6..7c812c3ad66 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
@@ -19,6 +19,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
index 8253fee5518..9d79ac2f839 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
index e17a6e9c5cb..c3d9175cfd9 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
@@ -13,6 +13,8 @@
#include <cassert>
// #include <memory>
+
+#include "test_macros.h"
//
// template <class Alloc>
// struct allocator_traits
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
index 2aa7a989114..b04bdf52845 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <type_traits>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/is_always_equal.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/is_always_equal.pass.cpp
index 628505f65cd..55f8482b1a3 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/is_always_equal.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/is_always_equal.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <type_traits>
+#include "test_macros.h"
#include "allocators.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
index fea53af299e..c22d6ec0f5f 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <type_traits>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
index d04ea6f1a43..bf363e3afa7 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <type_traits>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
index fcec67879fc..70c40d5b348 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
@@ -18,6 +18,7 @@
#include <scoped_allocator>
#include <type_traits>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/copy_assign.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/copy_assign.pass.cpp
index 1f871876f13..ca22e126595 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/copy_assign.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/copy_assign.pass.cpp
@@ -19,6 +19,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
index aaf5c1d59ad..c26c7a071a1 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
@@ -26,6 +26,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/move_assign.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/move_assign.pass.cpp
index c17c6d38439..9fc1c60a256 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/move_assign.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/move_assign.pass.cpp
@@ -19,6 +19,7 @@
#include <scoped_allocator>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/allocator.adaptor/types.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/types.pass.cpp
index 7820e29eef2..a28eface789 100644
--- a/libcxx/test/std/utilities/allocator.adaptor/types.pass.cpp
+++ b/libcxx/test/std/utilities/allocator.adaptor/types.pass.cpp
@@ -27,6 +27,7 @@
#include <scoped_allocator>
#include <type_traits>
+#include "test_macros.h"
#include "allocators.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp
index a8ac0d6012e..fd4dee2f2f3 100644
--- a/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp
@@ -17,6 +17,7 @@
#include <any>
#include <cassert>
+#include "test_macros.h"
#include "any_helpers.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp
index f49511138dd..9c85d3f6cf7 100644
--- a/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp
@@ -19,6 +19,7 @@
#include <any>
#include <cassert>
+#include "test_macros.h"
#include "any_helpers.h"
using std::any;
diff --git a/libcxx/test/std/utilities/any/any.class/any.observers/has_value.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.observers/has_value.pass.cpp
index 54b4153c974..3de84270c79 100644
--- a/libcxx/test/std/utilities/any/any.class/any.observers/has_value.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/any.observers/has_value.pass.cpp
@@ -15,6 +15,7 @@
#include <any>
#include <cassert>
+#include "test_macros.h"
#include "any_helpers.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/any/any.class/not_literal_type.pass.cpp b/libcxx/test/std/utilities/any/any.class/not_literal_type.pass.cpp
index 3a275d51e4a..1097fc5aec4 100644
--- a/libcxx/test/std/utilities/any/any.class/not_literal_type.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.class/not_literal_type.pass.cpp
@@ -15,6 +15,8 @@
#include <any>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**) {
static_assert(!std::is_literal_type<std::any>::value, "");
diff --git a/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp
index 5461a4d0cdf..1e982235f4a 100644
--- a/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp
@@ -19,6 +19,8 @@
#include <any>
#include <cassert>
+#include "test_macros.h"
+
using std::any;
using std::any_cast;
diff --git a/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp b/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp
index 541db06a175..c74935d2794 100644
--- a/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp
+++ b/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp
@@ -24,6 +24,7 @@
// from_chars_result from_chars(const char* first, const char* last,
// Integral& value, int base = 10)
+#include "test_macros.h"
#include "charconv_test_helpers.h"
template <typename T>
diff --git a/libcxx/test/std/utilities/charconv/charconv.to.chars/integral.pass.cpp b/libcxx/test/std/utilities/charconv/charconv.to.chars/integral.pass.cpp
index f6d81dc3f35..4bfe27d6dac 100644
--- a/libcxx/test/std/utilities/charconv/charconv.to.chars/integral.pass.cpp
+++ b/libcxx/test/std/utilities/charconv/charconv.to.chars/integral.pass.cpp
@@ -24,6 +24,7 @@
// to_chars_result to_chars(char* first, char* last, Integral value,
// int base = 10)
+#include "test_macros.h"
#include "charconv_test_helpers.h"
template <typename T>
diff --git a/libcxx/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp b/libcxx/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp
index 154a0f8877a..ec5dd27e80b 100644
--- a/libcxx/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp
@@ -10,6 +10,8 @@
#include <functional>
#include <string>
+#include "test_macros.h"
+
template <class T>
struct is_transparent
{
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/PR23141_invoke_not_constexpr.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/PR23141_invoke_not_constexpr.pass.cpp
index 931778f54d9..b1bc35889df 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/PR23141_invoke_not_constexpr.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/PR23141_invoke_not_constexpr.pass.cpp
@@ -19,6 +19,8 @@
#include <functional>
#include <type_traits>
+#include "test_macros.h"
+
struct Fun
{
template<typename T, typename U>
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp
index 8beeb3321d5..dfde0759341 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/copy.pass.cpp
@@ -21,6 +21,8 @@
#include <cmath>
#include <cassert>
+#include "test_macros.h"
+
float _pow(float a, float b)
{
return std::pow(a, b);
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_function_object.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_function_object.pass.cpp
index b87918da110..d7174df3369 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_function_object.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_function_object.pass.cpp
@@ -19,6 +19,8 @@
#include <functional>
+#include "test_macros.h"
+
struct DummyUnaryFunction
{
template <typename S>
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_int_0.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_int_0.pass.cpp
index a77e1895d6f..0f04df907e6 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_int_0.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_int_0.pass.cpp
@@ -18,6 +18,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
template <class R, class F>
void
test(F f, R expected)
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_lvalue.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_lvalue.pass.cpp
index 9b81d330132..5da40be9a6f 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_lvalue.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_lvalue.pass.cpp
@@ -20,6 +20,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int count = 0;
// 1 arg, return void
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_rvalue.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_rvalue.pass.cpp
index 10d2ce017f8..d9de4ef6578 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_rvalue.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_rvalue.pass.cpp
@@ -20,6 +20,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int count = 0;
// 1 arg, return void
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_void_0.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_void_0.pass.cpp
index 2c8e56f034e..20959a5b8ac 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_void_0.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_void_0.pass.cpp
@@ -18,6 +18,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int count = 0;
template <class F>
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/nested.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/nested.pass.cpp
index 0d5be341353..26196d45014 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/nested.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/nested.pass.cpp
@@ -21,6 +21,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
struct power
{
template <typename T>
diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.isbind/is_bind_expression_03.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.isbind/is_bind_expression_03.pass.cpp
index c1af159b293..3fe1be79460 100644
--- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.isbind/is_bind_expression_03.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.isbind/is_bind_expression_03.pass.cpp
@@ -17,6 +17,8 @@
#include <functional>
+#include "test_macros.h"
+
template <class T>
void test() {
static_assert(!std::is_bind_expression<T>::value, "");
diff --git a/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_not.pass.cpp b/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_not.pass.cpp
index 8bfa48f3e70..c7c1cf12cdd 100644
--- a/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_not.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_not.pass.cpp
@@ -15,6 +15,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::bit_not<int> F;
diff --git a/libcxx/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp b/libcxx/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp
index 5ad0f233f19..b2353473b53 100644
--- a/libcxx/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp
@@ -10,6 +10,8 @@
#include <functional>
#include <string>
+#include "test_macros.h"
+
template <class T>
struct is_transparent
{
diff --git a/libcxx/test/std/utilities/function.objects/comparisons/transparent.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/transparent.pass.cpp
index 4be81925b7f..cf8fb32bb76 100644
--- a/libcxx/test/std/utilities/function.objects/comparisons/transparent.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/comparisons/transparent.pass.cpp
@@ -10,6 +10,8 @@
#include <functional>
#include <string>
+#include "test_macros.h"
+
template <class T>
struct is_transparent
{
diff --git a/libcxx/test/std/utilities/function.objects/func.invoke/invoke.pass.cpp b/libcxx/test/std/utilities/function.objects/func.invoke/invoke.pass.cpp
index 0f25db0399f..6a385c74c98 100644
--- a/libcxx/test/std/utilities/function.objects/func.invoke/invoke.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.invoke/invoke.pass.cpp
@@ -43,6 +43,8 @@
#include <utility> // for std::move
#include <cassert>
+#include "test_macros.h"
+
struct NonCopyable {
NonCopyable() {}
private:
diff --git a/libcxx/test/std/utilities/function.objects/func.memfn/member_data.pass.cpp b/libcxx/test/std/utilities/function.objects/func.memfn/member_data.pass.cpp
index 52581881a5b..0c340072da5 100644
--- a/libcxx/test/std/utilities/function.objects/func.memfn/member_data.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.memfn/member_data.pass.cpp
@@ -13,6 +13,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
double data_;
diff --git a/libcxx/test/std/utilities/function.objects/func.memfn/member_function_const.pass.cpp b/libcxx/test/std/utilities/function.objects/func.memfn/member_function_const.pass.cpp
index dc93196cdc3..006a5bec2d3 100644
--- a/libcxx/test/std/utilities/function.objects/func.memfn/member_function_const.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.memfn/member_function_const.pass.cpp
@@ -14,6 +14,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
char test0() const {return 'a';}
diff --git a/libcxx/test/std/utilities/function.objects/func.memfn/member_function_const_volatile.pass.cpp b/libcxx/test/std/utilities/function.objects/func.memfn/member_function_const_volatile.pass.cpp
index 594e1de8ad6..175f2de7005 100644
--- a/libcxx/test/std/utilities/function.objects/func.memfn/member_function_const_volatile.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.memfn/member_function_const_volatile.pass.cpp
@@ -14,6 +14,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
char test0() const volatile {return 'a';}
diff --git a/libcxx/test/std/utilities/function.objects/func.memfn/member_function_volatile.pass.cpp b/libcxx/test/std/utilities/function.objects/func.memfn/member_function_volatile.pass.cpp
index 04439387dfe..7f27c2f1d99 100644
--- a/libcxx/test/std/utilities/function.objects/func.memfn/member_function_volatile.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.memfn/member_function_volatile.pass.cpp
@@ -14,6 +14,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
char test0() volatile {return 'a';}
diff --git a/libcxx/test/std/utilities/function.objects/func.require/binary_function.pass.cpp b/libcxx/test/std/utilities/function.objects/func.require/binary_function.pass.cpp
index 79a4855ea02..c1d5ba8899c 100644
--- a/libcxx/test/std/utilities/function.objects/func.require/binary_function.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.require/binary_function.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::binary_function<int, short, bool> bf;
diff --git a/libcxx/test/std/utilities/function.objects/func.require/unary_function.pass.cpp b/libcxx/test/std/utilities/function.objects/func.require/unary_function.pass.cpp
index f68b4b37c73..ebce76bc35d 100644
--- a/libcxx/test/std/utilities/function.objects/func.require/unary_function.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.require/unary_function.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::unary_function<int, bool> uf;
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/default.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/default.pass.cpp
index 55cde8fe777..e48a5f4ea09 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/default.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/default.pass.cpp
@@ -36,6 +36,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename Iter1, typename Iter2>
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pass.cpp
index 106b0d37f61..e9d93fc07fd 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pass.cpp
@@ -36,6 +36,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename T> struct MyHash {
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pred.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pred.pass.cpp
index be4db4e5a54..32f82df85fc 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pred.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pred.pass.cpp
@@ -36,6 +36,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename T> struct MyHash {
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/pred.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/pred.pass.cpp
index 3656caa8749..70e182eb4dd 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/pred.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/pred.pass.cpp
@@ -36,6 +36,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
struct count_equal
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/default.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/default.pass.cpp
index 0b345deedc1..14c295f4036 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/default.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/default.pass.cpp
@@ -36,6 +36,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename Iter1, typename Iter2>
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pass.cpp
index 4106c5d6ae7..d364f3e00b8 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pass.cpp
@@ -35,6 +35,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename T> struct MyHash {
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pred.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pred.pass.cpp
index 757bcc75792..ac9bdae6e12 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pred.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pred.pass.cpp
@@ -35,6 +35,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename T> struct MyHash {
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/pred.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/pred.pass.cpp
index 3a20b88512f..4494f7644cb 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/pred.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/pred.pass.cpp
@@ -35,6 +35,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
struct count_equal
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.default/default.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.default/default.pass.cpp
index eaf5eeb8273..6757b058748 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.default/default.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.default/default.pass.cpp
@@ -35,6 +35,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename Iter1, typename Iter2>
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.default/default.pred.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.default/default.pred.pass.cpp
index 773336f6626..043903d66da 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.default/default.pred.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.default/default.pred.pass.cpp
@@ -35,6 +35,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
struct count_equal
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.badcall/bad_function_call.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.badcall/bad_function_call.pass.cpp
index eb223b88e49..254ad9e2bcf 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.badcall/bad_function_call.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.badcall/bad_function_call.pass.cpp
@@ -19,6 +19,8 @@
#include <functional>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert((std::is_base_of<std::exception, std::bad_function_call>::value), "");
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/bad_function_call_ctor.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/bad_function_call_ctor.pass.cpp
index 385919227e0..e72ca95bae8 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/bad_function_call_ctor.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/bad_function_call_ctor.pass.cpp
@@ -13,6 +13,8 @@
#include <functional>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
std::bad_function_call ex;
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/operator_bool.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/operator_bool.pass.cpp
index ab5eef37270..ba19137c5af 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/operator_bool.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/operator_bool.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int g(int) {return 0;}
int main(int, char**)
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_incomplete.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_incomplete.pass.cpp
index 21c2f216efe..5f0fb2faf56 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_incomplete.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_incomplete.pass.cpp
@@ -17,6 +17,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
struct X{
typedef std::function<void(X&)> callback_type;
virtual ~X() {}
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
index 3b37ce6ffdc..3ae14fdea34 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
@@ -18,6 +18,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
index 583ca162ebf..3f3b5c696d7 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
@@ -17,6 +17,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
#include "test_allocator.h"
#include "count_new.hpp"
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
index 653057f6ec9..12de30e4a34 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
@@ -18,6 +18,7 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/default.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/default.pass.cpp
index e89bafba775..4b7e5f79dcb 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/default.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/default.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::function<int(int)> f;
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t.pass.cpp
index d58e191c470..cfd84234528 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::function<int(int)> f(nullptr);
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
index ff81080ffda..00ab664f7f0 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
@@ -17,6 +17,8 @@
#include "count_new.hpp"
+#include "test_macros.h"
+
class A
{
int data_[10];
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.pass.cpp
index fb67a3abf4a..60c540fa81e 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int count = 0;
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
index 93997a0b55f..8c8f3f53db6 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
@@ -17,6 +17,8 @@
#include "count_new.hpp"
+#include "test_macros.h"
+
class A {
int data_[10];
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/operator_==.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/operator_==.pass.cpp
index 698a461c8f0..6730536f76b 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/operator_==.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/operator_==.pass.cpp
@@ -25,6 +25,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int g(int) {return 0;}
int main(int, char**)
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp
index d5031ba06e7..317fbdb0bda 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp
@@ -24,6 +24,8 @@
#include <cstdlib>
#include <cassert>
+#include "test_macros.h"
+
class A
{
int data_[10];
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp
index d9c8fc48d75..1ff1854e4d6 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp
@@ -16,6 +16,8 @@
#include <typeinfo>
#include <cassert>
+#include "test_macros.h"
+
class A
{
int data_[10];
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/types.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/types.pass.cpp
index 8083ad83ac0..1399415a52d 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/types.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/types.pass.cpp
@@ -24,6 +24,8 @@
#include <functional>
#include <type_traits>
+#include "test_macros.h"
+
template <typename T>
class has_argument_type
diff --git a/libcxx/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp b/libcxx/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp
index eb590b31a01..42d12fc12ba 100644
--- a/libcxx/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp
@@ -10,6 +10,8 @@
#include <functional>
#include <string>
+#include "test_macros.h"
+
template <class T>
struct is_transparent
{
diff --git a/libcxx/test/std/utilities/function.objects/negators/binary_negate.pass.cpp b/libcxx/test/std/utilities/function.objects/negators/binary_negate.pass.cpp
index 91c19ece612..cc8e4219f8f 100644
--- a/libcxx/test/std/utilities/function.objects/negators/binary_negate.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/negators/binary_negate.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::binary_negate<std::logical_and<int> > F;
diff --git a/libcxx/test/std/utilities/function.objects/negators/not1.pass.cpp b/libcxx/test/std/utilities/function.objects/negators/not1.pass.cpp
index ccd6ab06736..2e436a69446 100644
--- a/libcxx/test/std/utilities/function.objects/negators/not1.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/negators/not1.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::logical_not<int> F;
diff --git a/libcxx/test/std/utilities/function.objects/negators/not2.pass.cpp b/libcxx/test/std/utilities/function.objects/negators/not2.pass.cpp
index 57d41a0d0f4..e4b69068c5f 100644
--- a/libcxx/test/std/utilities/function.objects/negators/not2.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/negators/not2.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::logical_and<int> F;
diff --git a/libcxx/test/std/utilities/function.objects/negators/unary_negate.pass.cpp b/libcxx/test/std/utilities/function.objects/negators/unary_negate.pass.cpp
index 4875c9ba2b0..da75720afb0 100644
--- a/libcxx/test/std/utilities/function.objects/negators/unary_negate.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/negators/unary_negate.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::unary_negate<std::logical_not<int> > F;
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
index c15989f003e..3a7121cbcbc 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
class functor1
{
};
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
index 3ef0cdda869..f82ee72de91 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
class functor1
{
};
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
index 355047d98ce..a20cf8f3bd3 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
class functor1
{
};
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/ctor.incomplete.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/ctor.incomplete.pass.cpp
index d26e4cb9011..c0e50022cb4 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/ctor.incomplete.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/ctor.incomplete.pass.cpp
@@ -18,6 +18,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
struct Foo;
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
index a43d0fd2510..4d536a20411 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
class functor1
{
};
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref.incomplete.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref.incomplete.pass.cpp
index 4aad297adb4..b72a0bbc270 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref.incomplete.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref.incomplete.pass.cpp
@@ -19,6 +19,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
struct Foo;
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref_1.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref_1.pass.cpp
index d4cb421f53e..2286d949e65 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref_1.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref_1.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
int i = 0;
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref_2.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref_2.pass.cpp
index 093b7e230fd..b4707f4e4bc 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref_2.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/cref_2.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
const int i = 0;
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref.incomplete.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref.incomplete.pass.cpp
index d5c26b274a4..a4f8b5f087a 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref.incomplete.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref.incomplete.pass.cpp
@@ -19,6 +19,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
struct Foo;
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_1.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_1.pass.cpp
index f64d8ad8cae..41614d3b2e2 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_1.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_1.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
int i = 0;
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp
index 4fdaf992c64..8e5e7c30e1e 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp
@@ -17,6 +17,8 @@
#include "counting_predicates.hpp"
+#include "test_macros.h"
+
bool is5 ( int i ) { return i == 5; }
template <typename T>
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.pass.cpp
index fd31041330d..e5f3b13c8a1 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.pass.cpp
@@ -18,6 +18,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
int count = 0;
// 1 arg, return void
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke_int_0.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke_int_0.pass.cpp
index 67cf51f3359..57748371a00 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke_int_0.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke_int_0.pass.cpp
@@ -18,6 +18,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
// 0 args, return int
int count = 0;
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke_void_0.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke_void_0.pass.cpp
index 18e65531333..cfaf75b157d 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke_void_0.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke_void_0.pass.cpp
@@ -18,6 +18,8 @@
#include <functional>
#include <cassert>
+#include "test_macros.h"
+
// 0 args, return void
int count = 0;
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/type.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/type.pass.cpp
index d17ab8100ef..31e1b693981 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/type.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/type.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <type_traits>
+#include "test_macros.h"
+
class C {};
int main(int, char**)
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/unwrap_ref_decay.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/unwrap_ref_decay.pass.cpp
index 1987898393c..d41baa7833c 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/unwrap_ref_decay.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/unwrap_ref_decay.pass.cpp
@@ -19,6 +19,8 @@
#include <functional>
#include <type_traits>
+#include "test_macros.h"
+
template <typename T, typename Result>
void check() {
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/unwrap_reference.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/unwrap_reference.pass.cpp
index 209d5e2a0bc..c9967d3a30a 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/unwrap_reference.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/unwrap_reference.pass.cpp
@@ -19,6 +19,8 @@
#include <functional>
#include <type_traits>
+#include "test_macros.h"
+
template <typename T, typename Expected>
void check_equal() {
diff --git a/libcxx/test/std/utilities/function.objects/refwrap/weak_result.pass.cpp b/libcxx/test/std/utilities/function.objects/refwrap/weak_result.pass.cpp
index 5a6a41fdbe0..a3577ff0642 100644
--- a/libcxx/test/std/utilities/function.objects/refwrap/weak_result.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/refwrap/weak_result.pass.cpp
@@ -15,6 +15,8 @@
#include <functional>
#include <type_traits>
+#include "test_macros.h"
+
template <class Arg, class Result>
struct my_unary_function
{ // std::unary_function was removed in C++17
diff --git a/libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp b/libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp
index 8f6c3e14e2c..c8711546764 100644
--- a/libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp
@@ -17,6 +17,8 @@
#include "poisoned_hash_helper.hpp"
+#include "test_macros.h"
+
int main(int, char**) {
test_library_hash_specializations_available();
diff --git a/libcxx/test/std/utilities/intseq/intseq.general/integer_seq.pass.cpp b/libcxx/test/std/utilities/intseq/intseq.general/integer_seq.pass.cpp
index 90b09132d9e..978032dce65 100644
--- a/libcxx/test/std/utilities/intseq/intseq.general/integer_seq.pass.cpp
+++ b/libcxx/test/std/utilities/intseq/intseq.general/integer_seq.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <typename AtContainer, typename T, T... I>
auto extract ( const AtContainer &t, const std::integer_sequence<T, I...> )
-> decltype ( std::make_tuple ( std::get<I>(t)... ))
diff --git a/libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.pass.cpp b/libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.pass.cpp
index a8e14c9a9cd..0b23ddbcfd3 100644
--- a/libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.pass.cpp
+++ b/libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.pass.cpp
@@ -22,6 +22,8 @@
#include <cstddef>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
// Make a few of sequences
diff --git a/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.pass.cpp b/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.pass.cpp
index 50b49dd725e..b0d1a1e5573 100644
--- a/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.pass.cpp
+++ b/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.pass.cpp
@@ -17,6 +17,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert(std::is_same<std::make_integer_sequence<int, 0>, std::integer_sequence<int>>::value, "");
diff --git a/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.pass.cpp b/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.pass.cpp
index e6b5a58c922..c0097a943c1 100644
--- a/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.pass.cpp
+++ b/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.pass.cpp
@@ -15,3 +15,5 @@
#define _LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE
#include "make_integer_seq.pass.cpp"
+
+#include "test_macros.h"
diff --git a/libcxx/test/std/utilities/memory/allocator.tag/allocator_arg.pass.cpp b/libcxx/test/std/utilities/memory/allocator.tag/allocator_arg.pass.cpp
index 1a58726a854..0253243319a 100644
--- a/libcxx/test/std/utilities/memory/allocator.tag/allocator_arg.pass.cpp
+++ b/libcxx/test/std/utilities/memory/allocator.tag/allocator_arg.pass.cpp
@@ -13,6 +13,8 @@
#include <memory>
+#include "test_macros.h"
+
void test(std::allocator_arg_t) {}
int main(int, char**)
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp b/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp
index 0ac2f266e81..9f923074d26 100644
--- a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp
+++ b/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp
@@ -19,6 +19,7 @@
#include <cstdint>
#include <cassert>
+#include "test_macros.h"
#include "incomplete_type_helper.h"
template <class T>
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp b/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp
index c738416e01d..cc2abda6da0 100644
--- a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp
+++ b/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp
@@ -19,6 +19,7 @@
#include <cstdint>
#include <cassert>
+#include "test_macros.h"
#include "incomplete_type_helper.h"
int called = 0;
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/is_always_equal.pass.cpp b/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/is_always_equal.pass.cpp
index 42b0fbab19c..add8c0b1186 100644
--- a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/is_always_equal.pass.cpp
+++ b/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/is_always_equal.pass.cpp
@@ -19,6 +19,8 @@
#include <memory>
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
struct A
{
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator_type.pass.cpp b/libcxx/test/std/utilities/memory/allocator.traits/allocator_type.pass.cpp
index 840ad820e1f..b3b6d7275e2 100644
--- a/libcxx/test/std/utilities/memory/allocator.traits/allocator_type.pass.cpp
+++ b/libcxx/test/std/utilities/memory/allocator.traits/allocator_type.pass.cpp
@@ -18,6 +18,8 @@
#include <memory>
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
struct A
{
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/value_type.pass.cpp b/libcxx/test/std/utilities/memory/allocator.traits/value_type.pass.cpp
index 047d40d5c89..b7cc2cd2503 100644
--- a/libcxx/test/std/utilities/memory/allocator.traits/value_type.pass.cpp
+++ b/libcxx/test/std/utilities/memory/allocator.traits/value_type.pass.cpp
@@ -18,6 +18,8 @@
#include <memory>
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
struct A
{
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp b/libcxx/test/std/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp
index 63412bce1f4..30f847a4cad 100644
--- a/libcxx/test/std/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp
+++ b/libcxx/test/std/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp
@@ -21,6 +21,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::allocator<int> a1;
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/address.pass.cpp b/libcxx/test/std/utilities/memory/default.allocator/allocator.members/address.pass.cpp
index c4ff55d0eab..a1333619473 100644
--- a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/address.pass.cpp
+++ b/libcxx/test/std/utilities/memory/default.allocator/allocator.members/address.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
template <class T>
void test_address()
{
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/max_size.pass.cpp b/libcxx/test/std/utilities/memory/default.allocator/allocator.members/max_size.pass.cpp
index c2094bc044a..2991bdfc31e 100644
--- a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/max_size.pass.cpp
+++ b/libcxx/test/std/utilities/memory/default.allocator/allocator.members/max_size.pass.cpp
@@ -16,6 +16,8 @@
#include <cstddef>
#include <cassert>
+#include "test_macros.h"
+
int new_called = 0;
int main(int, char**)
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp b/libcxx/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
index ad4319410a7..416d16c87bc 100644
--- a/libcxx/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
+++ b/libcxx/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
@@ -12,6 +12,8 @@
#include <cassert>
// #include <memory>
+
+#include "test_macros.h"
//
// template <class Alloc>
// struct allocator_traits
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator_void.pass.cpp b/libcxx/test/std/utilities/memory/default.allocator/allocator_void.pass.cpp
index 528902d2112..7c091d3d97c 100644
--- a/libcxx/test/std/utilities/memory/default.allocator/allocator_void.pass.cpp
+++ b/libcxx/test/std/utilities/memory/default.allocator/allocator_void.pass.cpp
@@ -22,6 +22,8 @@
#include <memory>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert((std::is_same<std::allocator<void>::pointer, void*>::value), "");
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/difference_type.pass.cpp b/libcxx/test/std/utilities/memory/pointer.traits/difference_type.pass.cpp
index 3eaedab1670..7546df90288 100644
--- a/libcxx/test/std/utilities/memory/pointer.traits/difference_type.pass.cpp
+++ b/libcxx/test/std/utilities/memory/pointer.traits/difference_type.pass.cpp
@@ -18,6 +18,8 @@
#include <memory>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert((std::is_same<std::pointer_traits<double*>::difference_type, std::ptrdiff_t>::value), "");
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/element_type.pass.cpp b/libcxx/test/std/utilities/memory/pointer.traits/element_type.pass.cpp
index 505881ddeea..e4f11c28e29 100644
--- a/libcxx/test/std/utilities/memory/pointer.traits/element_type.pass.cpp
+++ b/libcxx/test/std/utilities/memory/pointer.traits/element_type.pass.cpp
@@ -18,6 +18,8 @@
#include <memory>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert((std::is_same<std::pointer_traits<const short*>::element_type, const short>::value), "");
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/pointer.pass.cpp b/libcxx/test/std/utilities/memory/pointer.traits/pointer.pass.cpp
index 110a993dc66..14054b3c4f6 100644
--- a/libcxx/test/std/utilities/memory/pointer.traits/pointer.pass.cpp
+++ b/libcxx/test/std/utilities/memory/pointer.traits/pointer.pass.cpp
@@ -18,6 +18,8 @@
#include <memory>
#include <type_traits>
+#include "test_macros.h"
+
struct A
{
typedef short element_type;
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp b/libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp
index 9e6a48930e2..bd561ddb447 100644
--- a/libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp
+++ b/libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp
@@ -18,6 +18,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
template <class T>
struct A
{
diff --git a/libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp b/libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp
index 3d0216cce53..d227238f000 100644
--- a/libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp
+++ b/libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp
@@ -13,6 +13,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
const unsigned N = 20;
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
index f6310c7bc91..dde8a9e2be6 100644
--- a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
+++ b/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
@@ -13,6 +13,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
void operator&() const {}
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/constexpr_addressof.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/constexpr_addressof.pass.cpp
index f14a0e7fc89..2aabf812a75 100644
--- a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/constexpr_addressof.pass.cpp
+++ b/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/constexpr_addressof.pass.cpp
@@ -16,6 +16,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct Pointer {
constexpr Pointer(void* v) : value(v) {}
void* value;
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp
index d505222b02d..e7b1dbdb653 100644
--- a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp
+++ b/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp
@@ -17,6 +17,8 @@
#include <cstdlib>
#include <cassert>
+#include "test_macros.h"
+
struct Counted {
static int count;
static void reset() { count = 0; }
diff --git a/libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp b/libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp
index db71c69bf26..09cfc74ec19 100644
--- a/libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp
+++ b/libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp
@@ -21,6 +21,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct alignas(32) A {
int field;
};
diff --git a/libcxx/test/std/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp b/libcxx/test/std/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp
index 32a58e5a657..af798186f24 100644
--- a/libcxx/test/std/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp
+++ b/libcxx/test/std/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp
@@ -19,6 +19,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::pair<int*, std::ptrdiff_t> ip = std::get_temporary_buffer<int>(5);
diff --git a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.pass.cpp b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.pass.cpp
index b9b158a9d2b..9506ed2e34b 100644
--- a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.pass.cpp
+++ b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.pass.cpp
@@ -21,6 +21,8 @@
#include <sstream>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::unique_ptr<int> p(new int(3));
diff --git a/libcxx/test/std/utilities/memory/util.dynamic.safety/declare_no_pointers.pass.cpp b/libcxx/test/std/utilities/memory/util.dynamic.safety/declare_no_pointers.pass.cpp
index a2b6cf22ed8..892479fbeaf 100644
--- a/libcxx/test/std/utilities/memory/util.dynamic.safety/declare_no_pointers.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.dynamic.safety/declare_no_pointers.pass.cpp
@@ -13,6 +13,8 @@
#include <memory>
+#include "test_macros.h"
+
int main(int, char**)
{
char* p = new char[10];
diff --git a/libcxx/test/std/utilities/memory/util.dynamic.safety/declare_reachable.pass.cpp b/libcxx/test/std/utilities/memory/util.dynamic.safety/declare_reachable.pass.cpp
index c923089fa97..2d880ef5c06 100644
--- a/libcxx/test/std/utilities/memory/util.dynamic.safety/declare_reachable.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.dynamic.safety/declare_reachable.pass.cpp
@@ -14,6 +14,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
int* p = new int;
diff --git a/libcxx/test/std/utilities/memory/util.dynamic.safety/get_pointer_safety.pass.cpp b/libcxx/test/std/utilities/memory/util.dynamic.safety/get_pointer_safety.pass.cpp
index 2fea98364b4..709ab4b4994 100644
--- a/libcxx/test/std/utilities/memory/util.dynamic.safety/get_pointer_safety.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.dynamic.safety/get_pointer_safety.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
void test_pr26961() {
std::pointer_safety d;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp
index 440fa8ac480..677354e19ed 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp
@@ -17,6 +17,8 @@
#include "poisoned_hash_helper.hpp"
+#include "test_macros.h"
+
int main(int, char**) {
test_library_hash_specializations_available();
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
index 34717ad4256..0fcf27fb929 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
@@ -22,6 +22,8 @@
#if TEST_STD_VER >= 11
#include "poisoned_hash_helper.hpp"
+#include "test_macros.h"
+
struct A {};
#endif
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
index 209e3fe71af..338f37de373 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
@@ -14,6 +14,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
struct A
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp
index 896e50827dc..d71e702eae6 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp
@@ -19,6 +19,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp
index b67407c325a..75f58e4411f 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp
@@ -18,6 +18,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp
index 2b666315ef2..6fd4c8e0742 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp
index 6787c33c297..e73357a716e 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp
@@ -18,6 +18,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp
index e921a099189..dbc8ab5c490 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp
@@ -18,6 +18,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp
index 4abe371bc07..349fbec746f 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp
index 51e2949b6c6..e2bb126fd47 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
index 76009b96abd..d6d5da1197a 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp
index 9ea544fee01..1fe674fa530 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp
index 98b5bbf0d67..bea3b4e94e2 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp
@@ -38,6 +38,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
void do_nothing(int*) {}
int main(int, char**)
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/eq.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/eq.pass.cpp
index e25ba611744..2d1cee8ef89 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/eq.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/eq.pass.cpp
@@ -16,6 +16,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
void do_nothing(int*) {}
int main(int, char**)
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/lt.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/lt.pass.cpp
index fdef32d518a..478cb6c32e5 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/lt.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/lt.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
void do_nothing(int*) {}
int main(int, char**)
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp
index 247ca0fa924..17b346d3a13 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp
@@ -13,6 +13,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::shared_ptr<int> p;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp
index f29dd1cf7ea..c9a46dc48f5 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp
@@ -13,6 +13,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::shared_ptr<int> p(nullptr);
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp
index ee5861122bf..666741813ab 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp
@@ -14,6 +14,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
struct A
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
index 0881e8cf42d..23fff8c8995 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
@@ -12,6 +12,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
index 4700df0085c..51eccc59b36 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
@@ -13,6 +13,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
#include "test_allocator.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp
index b55d764a6c4..6eceb552ec1 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp
@@ -13,6 +13,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp
index fd98193826e..bb41fa89be3 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp
@@ -14,6 +14,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
struct A
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
index 0ec18a7aebd..e17ae6f3431 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
@@ -12,6 +12,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
index 5f2984c7e22..e39bda017a6 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
@@ -13,6 +13,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
#include "test_allocator.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
index da12e42ca0b..9fa32714bc1 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
@@ -21,6 +21,7 @@
#include <cstdlib>
#include "count_new.hpp"
+#include "test_macros.h"
#include "deleter_types.h"
struct A
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
index 15e776003d9..b7b5d145093 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
@@ -21,6 +21,8 @@
#include "count_new.hpp"
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp
index 091782f02f3..c9bd0f03311 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
index 01a74898f9c..6f770ef0dd2 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp
index 83a9a9720dc..3a600f8e30b 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
index 06c2bba6705..40d4639d881 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
@@ -19,6 +19,7 @@
#include <new>
#include <cstdlib>
#include <cassert>
+#include "test_macros.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp
index 00f79cc19d2..13c929dd4f7 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_cxx03.pass.cpp
@@ -18,6 +18,7 @@
#include <new>
#include <cstdlib>
#include <cassert>
+#include "test_macros.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp
index aa038f7475f..eb7f75aed51 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.volatile.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
template <typename T>
void test(const T &t0)
{
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp
index b09550a6eab..8903b75ae4e 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp
@@ -18,6 +18,8 @@
#include <sstream>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::shared_ptr<int> p(new int(3));
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp
index c9df003192b..55c22414d63 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp
index c3582416584..789013fdaac 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp
index e7d457fa139..97cd298cf2f 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp
@@ -14,6 +14,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
struct B
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
index 9e2bd101290..ee7f3762de0 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
@@ -14,6 +14,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
#include "test_allocator.h"
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp
index a27949ebb80..5070dbc1112 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp
index 77bf3a22e08..b968bd44317 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp
@@ -16,6 +16,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
const std::shared_ptr<std::pair<int, int> > p(new std::pair<int, int>(3, 4));
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp
index a6f75533acb..c8455e78d56 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
const std::shared_ptr<int> p(new int(32));
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp
index 247deb07bb9..69b0ff3ed5c 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp
index dfad3138517..0b7d29dbcc0 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
const std::shared_ptr<int> p(new int(32));
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp
index b0bfcae9ae4..47ae5dd8f72 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp
@@ -16,6 +16,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp
index f5bdb876b46..0666a98828d 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp
@@ -17,6 +17,8 @@
#include <memory>
+#include "test_macros.h"
+
struct A; // purposefully incomplete
int main(int, char**)
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp
index 02f180d3d64..6d6f4e13556 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp
index f41c391c4c2..ae166a56626 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp
index 33b2ddd422a..257e5ef189e 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp
index e5a70abe417..9d6c72db45a 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A;
int main(int, char**)
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp
index 45be55e66f8..24f57d3449f 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp
index 4268fda3aba..478af1e1b5a 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp
@@ -17,6 +17,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp
index eae249ca1a5..93be75b3360 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp
index 76703d0ddd7..73453d20ee8 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp
index 5fb2dd4f95b..bc0eb6e1a48 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp
index 50ff84318ef..107a587c7de 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp
index 53bc3eb9cd8..98429fd7406 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp
@@ -16,6 +16,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp
index f3e26dee54e..49a466b903b 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp
@@ -20,6 +20,8 @@
#include <cassert>
#include <cstring>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert((std::is_base_of<std::exception, std::bad_weak_ptr>::value), "");
diff --git a/libcxx/test/std/utilities/meta/meta.logical/conjunction.pass.cpp b/libcxx/test/std/utilities/meta/meta.logical/conjunction.pass.cpp
index e37769576d2..47c6361361b 100644
--- a/libcxx/test/std/utilities/meta/meta.logical/conjunction.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.logical/conjunction.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct True { static constexpr bool value = true; };
struct False { static constexpr bool value = false; };
diff --git a/libcxx/test/std/utilities/meta/meta.logical/disjunction.pass.cpp b/libcxx/test/std/utilities/meta/meta.logical/disjunction.pass.cpp
index baaed6f03ce..dc12e369092 100644
--- a/libcxx/test/std/utilities/meta/meta.logical/disjunction.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.logical/disjunction.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct True { static constexpr bool value = true; };
struct False { static constexpr bool value = false; };
diff --git a/libcxx/test/std/utilities/meta/meta.logical/negation.pass.cpp b/libcxx/test/std/utilities/meta/meta.logical/negation.pass.cpp
index 88ca693d31b..3dc775688af 100644
--- a/libcxx/test/std/utilities/meta/meta.logical/negation.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.logical/negation.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct True { static constexpr bool value = true; };
struct False { static constexpr bool value = false; };
diff --git a/libcxx/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp b/libcxx/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp
index 057d3b65823..b75b4468a70 100644
--- a/libcxx/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.rel/is_convertible_fallback.pass.cpp
@@ -23,3 +23,5 @@
#define _LIBCPP_USE_IS_CONVERTIBLE_FALLBACK
#include "is_convertible.pass.cpp"
+#include "test_macros.h"
+
diff --git a/libcxx/test/std/utilities/meta/meta.rel/is_nothrow_convertible.pass.cpp b/libcxx/test/std/utilities/meta/meta.rel/is_nothrow_convertible.pass.cpp
index 2a953d90b8e..00b533a8c41 100644
--- a/libcxx/test/std/utilities/meta/meta.rel/is_nothrow_convertible.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.rel/is_nothrow_convertible.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
struct A {};
struct B {
public:
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp
index 0b25ac1ba95..7f36df27b24 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cstddef> // for std::nullptr_t
+#include "test_macros.h"
+
template <class T>
void test_nullptr_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp
index 487e14446c3..c702e3646c7 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_array_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
index bc072198f2e..6368e2ada83 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_class_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/enum.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/enum.pass.cpp
index 71c74f2ba04..9bca19c82a0 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/enum.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/enum.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_enum_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/floating_point.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/floating_point.pass.cpp
index 957473c2a91..cff884bbd4d 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/floating_point.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/floating_point.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_floating_point_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/function.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/function.pass.cpp
index c27b1237ebf..c17be80643b 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/function.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/function.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_function_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp
index cac606a516e..0cbeb4a3205 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_integral_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp
index 7a46b97fbd0..da9c7bc1b83 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_bounded_array.pass.cpp
@@ -14,6 +14,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T, bool B>
void test_array_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_unbounded_array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_unbounded_array.pass.cpp
index 3a561b0b016..5e587f4058d 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_unbounded_array.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_unbounded_array.pass.cpp
@@ -14,6 +14,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T, bool B>
void test_array_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/lvalue_ref.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/lvalue_ref.pass.cpp
index 44027dadb26..b9c206e5c5c 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/lvalue_ref.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/lvalue_ref.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_lvalue_ref()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/member_function_pointer.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/member_function_pointer.pass.cpp
index fda2e81818a..005228c0896 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/member_function_pointer.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/member_function_pointer.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_member_function_pointer_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/member_object_pointer.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/member_object_pointer.pass.cpp
index 3e8117b6a01..67a79cb29eb 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/member_object_pointer.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/member_object_pointer.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_member_object_pointer_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/pointer.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/pointer.pass.cpp
index f5677b95b67..2c45167a912 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/pointer.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/pointer.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_pointer_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/rvalue_ref.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/rvalue_ref.pass.cpp
index 341b9462692..f00307aa969 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/rvalue_ref.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/rvalue_ref.pass.cpp
@@ -14,6 +14,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_rvalue_ref()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/union.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/union.pass.cpp
index fb48a70f35f..d72f4db8a00 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/union.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/union.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_union_imp()
{
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/void.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/void.pass.cpp
index 657f72774f4..3cd58d368e8 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/void.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/void.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
+#include "test_macros.h"
+
template <class T>
void test_void_imp()
{
diff --git a/libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp b/libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp
index 6f119b27423..b907dd45ea8 100644
--- a/libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp
@@ -17,6 +17,8 @@
#include <optional>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
using std::bad_optional_access;
diff --git a/libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp b/libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp
index 975d8678b89..135e2b28fdb 100644
--- a/libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp
@@ -16,6 +16,8 @@
#include <optional>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
using std::bad_optional_access;
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
index 4f7aedbcb0f..e79ec051ec6 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
index 373634f68c2..073ff324a8f 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
index 5d4839734bb..abbfbfeaf2e 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
index a601939c5b3..679bd69e721 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
index 7320955908a..0aa17a1560b 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
index 0d14f1e97a9..c3bdeb8256c 100644
--- a/libcxx/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp
index 66ab089dc30..fc84e6dc92a 100644
--- a/libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp
@@ -17,6 +17,8 @@
#include "poisoned_hash_helper.hpp"
+#include "test_macros.h"
+
int main(int, char**) {
test_library_hash_specializations_available();
{
diff --git a/libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp b/libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp
index aa89a51d8d4..d4f04164f60 100644
--- a/libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp
@@ -18,6 +18,8 @@
#include "poisoned_hash_helper.hpp"
+#include "test_macros.h"
+
struct A {};
struct B {};
diff --git a/libcxx/test/std/utilities/optional/optional.nullops/equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.nullops/equal.pass.cpp
index 5894462205a..232969011b9 100644
--- a/libcxx/test/std/utilities/optional/optional.nullops/equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.nullops/equal.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
int main(int, char**)
{
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.nullops/greater.pass.cpp b/libcxx/test/std/utilities/optional/optional.nullops/greater.pass.cpp
index 59dc62fce17..8e5a6ec6784 100644
--- a/libcxx/test/std/utilities/optional/optional.nullops/greater.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.nullops/greater.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
int main(int, char**)
{
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp
index e23e8794f44..8ff32bd6b70 100644
--- a/libcxx/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
int main(int, char**)
{
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp
index 96f0754e40b..c856cf1def2 100644
--- a/libcxx/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp
@@ -15,6 +15,8 @@
#include <optional>
+#include "test_macros.h"
+
int main(int, char**)
{
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.nullops/less_than.pass.cpp b/libcxx/test/std/utilities/optional/optional.nullops/less_than.pass.cpp
index 872f3159a92..e95d35398f8 100644
--- a/libcxx/test/std/utilities/optional/optional.nullops/less_than.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.nullops/less_than.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
int main(int, char**)
{
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp
index 7eea0fa8856..1de366a054a 100644
--- a/libcxx/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp
@@ -14,6 +14,8 @@
#include <optional>
+#include "test_macros.h"
+
int main(int, char**)
{
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.pass.cpp b/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.pass.cpp
index c9d843e9c2a..bc5a24c5a49 100644
--- a/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.pass.cpp
@@ -19,6 +19,8 @@
#include <optional>
#include <type_traits>
+#include "test_macros.h"
+
using std::nullopt_t;
using std::nullopt;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
index fa2edfcdd69..919dc22468e 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.pass.cpp
@@ -21,6 +21,8 @@
#include <optional>
#include <cassert>
+#include "test_macros.h"
+
struct A {};
int main(int, char**)
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp
index 927ac19ead1..12b19a72caf 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp
@@ -17,6 +17,8 @@
#include "archetypes.hpp"
+#include "test_macros.h"
+
using std::optional;
using std::nullopt_t;
using std::nullopt;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.dtor/dtor.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.dtor/dtor.pass.cpp
index 23497bc4c47..61da8672b08 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.dtor/dtor.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.dtor/dtor.pass.cpp
@@ -15,6 +15,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
using std::optional;
struct PODType {
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.mod/reset.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.mod/reset.pass.cpp
index 704606c6f75..05153a07f2f 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.mod/reset.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.mod/reset.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
using std::optional;
struct X
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_or_const.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_or_const.pass.cpp
index 736fe791af6..71f7905ad91 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_or_const.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_or_const.pass.cpp
@@ -15,6 +15,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
using std::optional;
struct Y
diff --git a/libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp
index 28783264d71..2449801be18 100644
--- a/libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp
@@ -18,6 +18,8 @@
#include "archetypes.hpp"
+#include "test_macros.h"
+
template <class T>
struct SpecialMemberTest {
diff --git a/libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp
index f53d86000e7..3af60a6bf9f 100644
--- a/libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp
@@ -24,6 +24,8 @@
#include "archetypes.hpp"
+#include "test_macros.h"
+
constexpr bool implies(bool p, bool q) {
return !p || q;
diff --git a/libcxx/test/std/utilities/optional/optional.object/types.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/types.pass.cpp
index 7c32d1857cd..09107243abe 100644
--- a/libcxx/test/std/utilities/optional/optional.object/types.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/types.pass.cpp
@@ -19,6 +19,8 @@
#include <optional>
#include <type_traits>
+#include "test_macros.h"
+
using std::optional;
template <class Opt, class T>
diff --git a/libcxx/test/std/utilities/optional/optional.relops/equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/equal.pass.cpp
index 4fc85157a76..e7c98198531 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/equal.pass.cpp
@@ -15,6 +15,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
index 4bc9720aa7f..c7cbc1538aa 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
@@ -13,6 +13,8 @@
#include <optional>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.relops/greater_than.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
index d168cd70635..01081204200 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
@@ -13,6 +13,8 @@
#include <optional>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.relops/less_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
index 835be64f8fb..d1c232e1fe4 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
@@ -13,6 +13,8 @@
#include <optional>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.relops/less_than.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/less_than.pass.cpp
index 832de4b2981..09adb21736a 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/less_than.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/less_than.pass.cpp
@@ -13,6 +13,8 @@
#include <optional>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.relops/not_equal.pass.cpp b/libcxx/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
index ab00b7aab18..643425d1b9e 100644
--- a/libcxx/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
@@ -15,6 +15,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
using std::optional;
struct X {
diff --git a/libcxx/test/std/utilities/optional/optional.specalg/make_optional_explicit.pass.cpp b/libcxx/test/std/utilities/optional/optional.specalg/make_optional_explicit.pass.cpp
index d3461542b93..e736eb4a355 100644
--- a/libcxx/test/std/utilities/optional/optional.specalg/make_optional_explicit.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.specalg/make_optional_explicit.pass.cpp
@@ -17,6 +17,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
using std::optional;
diff --git a/libcxx/test/std/utilities/optional/optional.syn/optional_includes_initializer_list.pass.cpp b/libcxx/test/std/utilities/optional/optional.syn/optional_includes_initializer_list.pass.cpp
index daaad5664b6..663e1ca8395 100644
--- a/libcxx/test/std/utilities/optional/optional.syn/optional_includes_initializer_list.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.syn/optional_includes_initializer_list.pass.cpp
@@ -13,6 +13,8 @@
#include <optional>
+#include "test_macros.h"
+
int main(int, char**)
{
using std::optional;
diff --git a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_add.pass.cpp b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_add.pass.cpp
index c62f75a0d87..50cea314c0e 100644
--- a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_add.pass.cpp
+++ b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_add.pass.cpp
@@ -10,6 +10,8 @@
#include <ratio>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_divide.pass.cpp b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_divide.pass.cpp
index ce7f69473bc..79a660f3d98 100644
--- a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_divide.pass.cpp
+++ b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_divide.pass.cpp
@@ -10,6 +10,8 @@
#include <ratio>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_multiply.pass.cpp b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_multiply.pass.cpp
index e20f2344347..dcb1684e561 100644
--- a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_multiply.pass.cpp
+++ b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_multiply.pass.cpp
@@ -10,6 +10,8 @@
#include <ratio>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_subtract.pass.cpp b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_subtract.pass.cpp
index e3871f7a7cf..bba506f5b96 100644
--- a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_subtract.pass.cpp
+++ b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_subtract.pass.cpp
@@ -10,6 +10,8 @@
#include <ratio>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/ratio/ratio.ratio/ratio.pass.cpp b/libcxx/test/std/utilities/ratio/ratio.ratio/ratio.pass.cpp
index 336d7d8e5b5..c14c7d93b8a 100644
--- a/libcxx/test/std/utilities/ratio/ratio.ratio/ratio.pass.cpp
+++ b/libcxx/test/std/utilities/ratio/ratio.ratio/ratio.pass.cpp
@@ -11,6 +11,8 @@
#include <ratio>
+#include "test_macros.h"
+
template <long long N, long long D, long long eN, long long eD>
void test()
{
diff --git a/libcxx/test/std/utilities/ratio/typedefs.pass.cpp b/libcxx/test/std/utilities/ratio/typedefs.pass.cpp
index 8e24ff9749d..06e9682b67c 100644
--- a/libcxx/test/std/utilities/ratio/typedefs.pass.cpp
+++ b/libcxx/test/std/utilities/ratio/typedefs.pass.cpp
@@ -10,6 +10,8 @@
#include <ratio>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert(std::atto::num == 1 && std::atto::den == 1000000000000000000ULL, "");
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp
index bc42afda309..89364b058f1 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp
@@ -21,6 +21,7 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
#include "unique_ptr_test_helper.h"
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp
index ce912546533..aa766c6336a 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp
@@ -18,6 +18,7 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
#include "unique_ptr_test_helper.h"
template <class APtr, class BPtr>
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp
index d5f46935a19..0b2ead49e5d 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp
@@ -18,6 +18,7 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
#include "unique_ptr_test_helper.h"
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp
index ecba79dfd32..1af7eccb38c 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp
@@ -15,6 +15,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "unique_ptr_test_helper.h"
// test assignment from null
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp
index 5cd44b2f647..4a44a92dd2a 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp
@@ -15,6 +15,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "unique_ptr_test_helper.h"
// test assignment from null
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.runtime.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.runtime.pass.cpp
index bcf85b11031..632af112500 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.runtime.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.runtime.pass.cpp
@@ -17,6 +17,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
#include "unique_ptr_test_helper.h"
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp
index 9ef48b2e4af..c067f642e67 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
class Deleter {
int state_;
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp
index 4f5a519b798..583cbcf50c1 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp
@@ -15,6 +15,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "unique_ptr_test_helper.h"
int main(int, char**) {
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp
index d5e15aafe24..7f60e416b8d 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp
@@ -14,6 +14,8 @@
#include <memory>
+#include "test_macros.h"
+
struct A {
std::unique_ptr<A> ptr_;
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.single.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.single.pass.cpp
index 254d88bb6cf..fae3576b125 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.single.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.single.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**) {
std::unique_ptr<int> p(new int(3));
assert(*p == 3);
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.single.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.single.pass.cpp
index f31ca6b286d..4a50d1f29d1 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.single.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.single.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A {
int i_;
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.runtime.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.runtime.pass.cpp
index 21e7e661688..1b11d695e96 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.runtime.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.runtime.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
class A {
int state_;
static int next_;
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array.pass.cpp
index 715335eb1cd..bf991db830e 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array.pass.cpp
@@ -11,6 +11,8 @@
#include <string>
#include <cassert>
+#include "test_macros.h"
+
// The only way to create an unique_ptr<T[]> is to default construct them.
class foo {
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.single.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.single.pass.cpp
index 08062c122e1..0360af09f97 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.single.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.single.pass.cpp
@@ -11,6 +11,8 @@
#include <string>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp
index 6b8407c571a..83a5f3132e7 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp
@@ -13,6 +13,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp
index e7cbeaba5e0..a5101b9889d 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp
@@ -13,6 +13,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp
index 14e210598c1..0eae429fd40 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp
@@ -19,6 +19,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::default_delete<int[]> d1;
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp
index 9b220462b67..1693d11418d 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp
@@ -15,6 +15,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
static int count;
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp
index 52c399e64f7..ad3e1e2ddb1 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp
@@ -38,6 +38,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
void do_nothing(int*) {}
int main(int, char**)
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/eq.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/eq.pass.cpp
index ce83b575031..0d0ac2709b7 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/eq.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/eq.pass.cpp
@@ -21,6 +21,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
struct A
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/rel.pass.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/rel.pass.cpp
index 5fad4beb6c6..bc411ca545c 100644
--- a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/rel.pass.cpp
+++ b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/rel.pass.cpp
@@ -29,6 +29,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "deleter_types.h"
struct A
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp
index a499b66fdb5..5adc060c8ae 100644
--- a/libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp
@@ -17,6 +17,8 @@
#include "poisoned_hash_helper.hpp"
+#include "test_macros.h"
+
int main(int, char**) {
test_library_hash_specializations_available();
{
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.members/all.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.members/all.pass.cpp
index fe9e0e0a363..f956e06bf63 100644
--- a/libcxx/test/std/utilities/template.bitset/bitset.members/all.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/bitset.members/all.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <std::size_t N>
void test_all()
{
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.members/any.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.members/any.pass.cpp
index 95b640178b9..ac9a84b3a9b 100644
--- a/libcxx/test/std/utilities/template.bitset/bitset.members/any.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/bitset.members/any.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <std::size_t N>
void test_any()
{
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.members/none.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.members/none.pass.cpp
index 2588ac60f7b..9b0d1070778 100644
--- a/libcxx/test/std/utilities/template.bitset/bitset.members/none.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/bitset.members/none.pass.cpp
@@ -12,6 +12,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <std::size_t N>
void test_none()
{
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.members/size.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.members/size.pass.cpp
index 41318d99eef..336e3e8dd4b 100644
--- a/libcxx/test/std/utilities/template.bitset/bitset.members/size.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/bitset.members/size.pass.cpp
@@ -11,6 +11,8 @@
#include <bitset>
#include <cassert>
+#include "test_macros.h"
+
template <std::size_t N>
void test_size()
{
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp
index c43ef90aeef..670a680433f 100644
--- a/libcxx/test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp
@@ -14,6 +14,8 @@
#include <climits>
#include <cassert>
+#include "test_macros.h"
+
template <std::size_t N>
void test_to_ullong()
{
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
index c6cf6b19a18..b01d7948d65 100644
--- a/libcxx/test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
@@ -15,6 +15,8 @@
#include <climits>
#include <cassert>
+#include "test_macros.h"
+
template <std::size_t N>
void test_to_ulong()
{
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_out.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_out.pass.cpp
index 43c20f848bb..3ef0eb8bf9b 100644
--- a/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_out.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_out.pass.cpp
@@ -16,6 +16,8 @@
#include <sstream>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::ostringstream os;
diff --git a/libcxx/test/std/utilities/template.bitset/includes.pass.cpp b/libcxx/test/std/utilities/template.bitset/includes.pass.cpp
index 90695ed3dcc..43d9e08b66a 100644
--- a/libcxx/test/std/utilities/template.bitset/includes.pass.cpp
+++ b/libcxx/test/std/utilities/template.bitset/includes.pass.cpp
@@ -10,6 +10,8 @@
#include <bitset>
+#include "test_macros.h"
+
template <class> void test_typedef() {}
int main(int, char**)
diff --git a/libcxx/test/std/utilities/time/days.pass.cpp b/libcxx/test/std/utilities/time/days.pass.cpp
index 43b53ea33cb..52b9ea00c35 100644
--- a/libcxx/test/std/utilities/time/days.pass.cpp
+++ b/libcxx/test/std/utilities/time/days.pass.cpp
@@ -15,6 +15,8 @@
#include <type_traits>
#include <limits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::days D;
diff --git a/libcxx/test/std/utilities/time/hours.pass.cpp b/libcxx/test/std/utilities/time/hours.pass.cpp
index 97fc2621b6a..1372f9a3108 100644
--- a/libcxx/test/std/utilities/time/hours.pass.cpp
+++ b/libcxx/test/std/utilities/time/hours.pass.cpp
@@ -14,6 +14,8 @@
#include <type_traits>
#include <limits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::hours D;
diff --git a/libcxx/test/std/utilities/time/microseconds.pass.cpp b/libcxx/test/std/utilities/time/microseconds.pass.cpp
index ded1c22fe14..ca21ace5d19 100644
--- a/libcxx/test/std/utilities/time/microseconds.pass.cpp
+++ b/libcxx/test/std/utilities/time/microseconds.pass.cpp
@@ -14,6 +14,8 @@
#include <type_traits>
#include <limits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::microseconds D;
diff --git a/libcxx/test/std/utilities/time/milliseconds.pass.cpp b/libcxx/test/std/utilities/time/milliseconds.pass.cpp
index b1fe99e1209..231375b5ab1 100644
--- a/libcxx/test/std/utilities/time/milliseconds.pass.cpp
+++ b/libcxx/test/std/utilities/time/milliseconds.pass.cpp
@@ -14,6 +14,8 @@
#include <type_traits>
#include <limits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::milliseconds D;
diff --git a/libcxx/test/std/utilities/time/minutes.pass.cpp b/libcxx/test/std/utilities/time/minutes.pass.cpp
index 23f0bf2877d..14e79f4ab63 100644
--- a/libcxx/test/std/utilities/time/minutes.pass.cpp
+++ b/libcxx/test/std/utilities/time/minutes.pass.cpp
@@ -14,6 +14,8 @@
#include <type_traits>
#include <limits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::minutes D;
diff --git a/libcxx/test/std/utilities/time/months.pass.cpp b/libcxx/test/std/utilities/time/months.pass.cpp
index b14b2fab533..2212e934737 100644
--- a/libcxx/test/std/utilities/time/months.pass.cpp
+++ b/libcxx/test/std/utilities/time/months.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <limits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::months D;
diff --git a/libcxx/test/std/utilities/time/nanoseconds.pass.cpp b/libcxx/test/std/utilities/time/nanoseconds.pass.cpp
index d58a375c2a5..29c97322312 100644
--- a/libcxx/test/std/utilities/time/nanoseconds.pass.cpp
+++ b/libcxx/test/std/utilities/time/nanoseconds.pass.cpp
@@ -14,6 +14,8 @@
#include <type_traits>
#include <limits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::nanoseconds D;
diff --git a/libcxx/test/std/utilities/time/seconds.pass.cpp b/libcxx/test/std/utilities/time/seconds.pass.cpp
index 45a3f1d8e7f..57fbb1d27e3 100644
--- a/libcxx/test/std/utilities/time/seconds.pass.cpp
+++ b/libcxx/test/std/utilities/time/seconds.pass.cpp
@@ -14,6 +14,8 @@
#include <type_traits>
#include <limits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::seconds D;
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.file/consistency.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.file/consistency.pass.cpp
index 34244a8719b..34a4f60e2ac 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.file/consistency.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.file/consistency.pass.cpp
@@ -20,6 +20,8 @@
#include <chrono>
+#include "test_macros.h"
+
template <class T>
void test(const T &) {}
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.file/rep_signed.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.file/rep_signed.pass.cpp
index c87fad2588c..bed859a1428 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.file/rep_signed.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.file/rep_signed.pass.cpp
@@ -17,6 +17,8 @@
#include <chrono>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert(std::is_signed<std::chrono::file_clock::rep>::value, "");
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp
index 1650d3b6b5f..1f8a8873870 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp
@@ -24,6 +24,8 @@
#include <chrono>
+#include "test_macros.h"
+
template <class T>
void test(const T &) {}
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.hires/now.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.hires/now.pass.cpp
index ddf3ced87da..db1fb55df90 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.hires/now.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.hires/now.pass.cpp
@@ -15,6 +15,8 @@
#include <chrono>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::high_resolution_clock C;
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
index 0797f2cb5bc..4e170baa37c 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
@@ -26,6 +26,8 @@
#include <chrono>
+#include "test_macros.h"
+
template <class T>
void test(const T &) {}
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.steady/now.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.steady/now.pass.cpp
index 7d268fd67de..4b8104dd1a6 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.steady/now.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.steady/now.pass.cpp
@@ -17,6 +17,8 @@
#include <chrono>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::steady_clock C;
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/consistency.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.system/consistency.pass.cpp
index b92652134ad..06596f8975f 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.system/consistency.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.system/consistency.pass.cpp
@@ -24,6 +24,8 @@
#include <chrono>
+#include "test_macros.h"
+
template <class T>
void test(const T &) {}
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp
index 54252718d4a..70dd8117e6c 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp
@@ -15,6 +15,8 @@
#include <chrono>
#include <ctime>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::system_clock C;
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/now.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.system/now.pass.cpp
index 9d74541f989..dade6bafa47 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.system/now.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.system/now.pass.cpp
@@ -15,6 +15,8 @@
#include <chrono>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::system_clock C;
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp
index 967af52e11d..69546a6518e 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp
@@ -15,6 +15,8 @@
#include <chrono>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
assert(std::chrono::system_clock::duration::min() <
diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp
index 86b37bb6bd1..bf4339c32d1 100644
--- a/libcxx/test/std/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp
@@ -15,6 +15,8 @@
#include <chrono>
#include <ctime>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::system_clock C;
diff --git a/libcxx/test/std/utilities/time/time.duration/default_ratio.pass.cpp b/libcxx/test/std/utilities/time/time.duration/default_ratio.pass.cpp
index 08870488c16..d59d59a6bbd 100644
--- a/libcxx/test/std/utilities/time/time.duration/default_ratio.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/default_ratio.pass.cpp
@@ -18,6 +18,8 @@
#include <chrono>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert((std::is_same<std::chrono::duration<int, std::ratio<1> >,
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.pass.cpp
index 06f9a7c7f03..605e27cd982 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.pass.cpp
@@ -19,6 +19,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <class Duration>
void
test(const Duration& f, const Duration& d)
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.pass.cpp
index a6e1982d044..85d7338347c 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.pass.cpp
@@ -21,6 +21,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <class ToDuration, class FromDuration>
void
test(const FromDuration& f, const ToDuration& d)
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.pass.cpp
index 6783b1f67ed..d1c29be1bc9 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.pass.cpp
@@ -20,6 +20,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <class ToDuration, class FromDuration>
void
test(const FromDuration& f, const ToDuration& d)
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.pass.cpp
index ebd2e3194a4..274c91280c3 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.pass.cpp
@@ -20,6 +20,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <class ToDuration, class FromDuration>
void
test(const FromDuration& f, const ToDuration& d)
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_overflow.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_overflow.pass.cpp
index 5b963f2b1f4..d76018dbd49 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_overflow.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_overflow.pass.cpp
@@ -18,6 +18,8 @@
#include <chrono>
#include <cassert>
+#include "test_macros.h"
+
bool called = false;
void f(std::chrono::milliseconds);
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp
index 2e5b7bbb87b..3961e2110cf 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.pass.cpp
@@ -11,6 +11,8 @@
#include <chrono>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
using namespace std::chrono;
diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp
index d0b8b33e493..2ab1c930d34 100644
--- a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.pass.cpp
@@ -13,6 +13,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
using namespace std::literals;
diff --git a/libcxx/test/std/utilities/time/time.duration/types.pass.cpp b/libcxx/test/std/utilities/time/time.duration/types.pass.cpp
index 250e532859e..30f92863be2 100644
--- a/libcxx/test/std/utilities/time/time.duration/types.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.duration/types.pass.cpp
@@ -18,6 +18,8 @@
#include <chrono>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::duration<long, std::ratio<3, 2> > D;
diff --git a/libcxx/test/std/utilities/time/time.point/default_duration.pass.cpp b/libcxx/test/std/utilities/time/time.point/default_duration.pass.cpp
index 8a58413a0aa..5e95fe03ac9 100644
--- a/libcxx/test/std/utilities/time/time.point/default_duration.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.point/default_duration.pass.cpp
@@ -18,6 +18,8 @@
#include <chrono>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert((std::is_same<std::chrono::system_clock::duration,
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.pass.cpp
index 8dfd1bdaa38..e2dd8787384 100644
--- a/libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.pass.cpp
@@ -19,6 +19,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <class FromDuration, class ToDuration>
void
test(const FromDuration& df, const ToDuration& d)
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/floor.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cast/floor.pass.cpp
index d50fff4a1c8..84611109a1c 100644
--- a/libcxx/test/std/utilities/time/time.point/time.point.cast/floor.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.point/time.point.cast/floor.pass.cpp
@@ -19,6 +19,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <class FromDuration, class ToDuration>
void
test(const FromDuration& df, const ToDuration& d)
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/round.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cast/round.pass.cpp
index d8bb1b505b1..a9a91c5e059 100644
--- a/libcxx/test/std/utilities/time/time.point/time.point.cast/round.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.point/time.point.cast/round.pass.cpp
@@ -19,6 +19,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
template <class FromDuration, class ToDuration>
void
test(const FromDuration& df, const ToDuration& d)
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp b/libcxx/test/std/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp
index 3dde5404727..93da8b9b300 100644
--- a/libcxx/test/std/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp
@@ -16,6 +16,8 @@
#include <chrono>
+#include "test_macros.h"
+
template <class D1, class D2, class De>
void
test()
diff --git a/libcxx/test/std/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp b/libcxx/test/std/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp
index d73bb8ae6fd..ea20bf856b0 100644
--- a/libcxx/test/std/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp
+++ b/libcxx/test/std/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp
@@ -16,6 +16,8 @@
#include <chrono>
+#include "test_macros.h"
+
template <class D1, class D2, class De>
void
test()
diff --git a/libcxx/test/std/utilities/time/weeks.pass.cpp b/libcxx/test/std/utilities/time/weeks.pass.cpp
index 5a0cf3417f5..82ca68ad217 100644
--- a/libcxx/test/std/utilities/time/weeks.pass.cpp
+++ b/libcxx/test/std/utilities/time/weeks.pass.cpp
@@ -15,6 +15,8 @@
#include <type_traits>
#include <limits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::weeks D;
diff --git a/libcxx/test/std/utilities/time/years.pass.cpp b/libcxx/test/std/utilities/time/years.pass.cpp
index 5016369268a..b08e77fe854 100644
--- a/libcxx/test/std/utilities/time/years.pass.cpp
+++ b/libcxx/test/std/utilities/time/years.pass.cpp
@@ -15,6 +15,8 @@
#include <type_traits>
#include <limits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::chrono::years D;
diff --git a/libcxx/test/std/utilities/tuple/tuple.general/tuple.smartptr.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.general/tuple.smartptr.pass.cpp
index d57e7ad1825..43448409393 100644
--- a/libcxx/test/std/utilities/tuple/tuple.general/tuple.smartptr.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.general/tuple.smartptr.pass.cpp
@@ -15,6 +15,8 @@
#include <tuple>
#include <memory>
+#include "test_macros.h"
+
int main(int, char**) {
{
std::tuple<std::unique_ptr<char>> up;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
index ede72c2a50f..a2e69baa9b2 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
@@ -13,6 +13,8 @@
#include <tuple>
#include <functional>
+#include "test_macros.h"
+
struct X
{
X() {}
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_extended_types.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_extended_types.pass.cpp
index 851a535eb49..5d7c28bf24f 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_extended_types.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_extended_types.pass.cpp
@@ -23,6 +23,7 @@
// std::array is explicitly allowed to be initialized with A a = { init-list };.
// Disable the missing braces warning for this reason.
+#include "test_macros.h"
#include "disable_missing_braces_warning.h"
int count = 0;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_large_arity.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_large_arity.pass.cpp
index 004a5d46435..ce9f177e4bd 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_large_arity.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.apply/apply_large_arity.pass.cpp
@@ -19,6 +19,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
////////////////////////////////////////////////////////////////////////////////
template <class T, std::size_t Dummy = 0>
struct always_imp
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp
index 9353add370f..cb0b6245dbe 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp
@@ -19,6 +19,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp
index 8b9447c9900..59bc5e75811 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp
@@ -19,6 +19,8 @@
#include <string>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
int id_;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
index 71855a309c5..7b51b6f3cf0 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
@@ -21,6 +21,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
int id_;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp
index 575c3b1dfad..3ed3037217a 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp
@@ -19,6 +19,7 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
#include "MoveOnly.h"
struct NonAssignable {
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp
index 9681a238a9d..ea77a3eb46b 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp
@@ -20,6 +20,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
int id_;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/tuple_array_template_depth.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/tuple_array_template_depth.pass.cpp
index 5796e8dbe08..e37c2528035 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/tuple_array_template_depth.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/tuple_array_template_depth.pass.cpp
@@ -21,6 +21,8 @@
#include <array>
#include <tuple>
+#include "test_macros.h"
+
// Use 1256 to try and blow the template instantiation depth for all compilers.
typedef std::array<char, 1256> array_t;
typedef std::tuple<array_t> tuple_t;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR22806_constrain_tuple_like_ctor.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR22806_constrain_tuple_like_ctor.pass.cpp
index 1e1b0846cc2..9f262be73a4 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR22806_constrain_tuple_like_ctor.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR22806_constrain_tuple_like_ctor.pass.cpp
@@ -24,6 +24,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
template <class Tp>
using uncvref_t = typename std::remove_cv<typename std::remove_reference<Tp>::type>::type;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR23256_constrain_UTypes_ctor.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR23256_constrain_UTypes_ctor.pass.cpp
index 919d88e46a3..7376a38c9b6 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR23256_constrain_UTypes_ctor.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR23256_constrain_UTypes_ctor.pass.cpp
@@ -24,6 +24,8 @@
#include <memory>
#include <type_traits>
+#include "test_macros.h"
+
struct UnconstrainedCtor {
int value_;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR27684_contains_ref_to_incomplete_type.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR27684_contains_ref_to_incomplete_type.pass.cpp
index 1493f4f8160..f9c4a7d1461 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR27684_contains_ref_to_incomplete_type.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR27684_contains_ref_to_incomplete_type.pass.cpp
@@ -23,6 +23,8 @@
#include <tuple>
#include <cassert>
+#include "test_macros.h"
+
struct IncompleteType;
extern IncompleteType inc1;
extern IncompleteType inc2;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR31384.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR31384.pass.cpp
index 6c44f7027ee..26013d80489 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR31384.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/PR31384.pass.cpp
@@ -17,6 +17,8 @@
#include <tuple>
#include <cassert>
+#include "test_macros.h"
+
int count = 0;
struct Explicit {
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
index c5f52a92846..b0f957e3a37 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
@@ -22,6 +22,7 @@
#include <tuple>
#include <cassert>
+#include "test_macros.h"
#include "DefaultOnly.h"
#include "allocators.h"
#include "../alloc_first.h"
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
index 57e2f1b4188..050a4b0d5d5 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
@@ -18,6 +18,7 @@
#include <tuple>
#include <cassert>
+#include "test_macros.h"
#include "MoveOnly.h"
#include "allocators.h"
#include "../alloc_first.h"
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp
index 3b5b27f7b15..d1cd59600bd 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp
@@ -19,6 +19,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp
index a7cffa72db6..f3dc0a27e15 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp
@@ -19,6 +19,7 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
index 083e15797f6..86989a8fb15 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
@@ -19,6 +19,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
index 1f33ef2fc6e..6973616a53a 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
@@ -20,6 +20,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
index 1db842b8d91..37b0c7bd1df 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
@@ -18,6 +18,7 @@
#include <tuple>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
index fc25a4fc6a4..e4697becfdd 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
@@ -18,6 +18,7 @@
#include <tuple>
#include <cassert>
+#include "test_macros.h"
#include "MoveOnly.h"
#include "allocators.h"
#include "../alloc_first.h"
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp
index e45702d88b7..f1492f9c4a6 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp
@@ -20,6 +20,7 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
#include "allocators.h"
#include "../alloc_first.h"
#include "../alloc_last.h"
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_move.pass.cpp
index 071f13cf913..f343201447b 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_move.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_move.pass.cpp
@@ -19,6 +19,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct Explicit {
int value;
explicit Explicit(int x) : value(x) {}
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
index ae296f73945..46fd35ad4dd 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
@@ -19,6 +19,7 @@
#include <cassert>
#include <type_traits>
+#include "test_macros.h"
#include "DefaultOnly.h"
struct NoDefault {
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/dtor.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/dtor.pass.cpp
index 80b09b87180..4c0b2945fa4 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/dtor.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/dtor.pass.cpp
@@ -23,6 +23,8 @@
#include <cassert>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
static_assert(std::is_trivially_destructible<
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
index 977dc4c3264..c298c4e45bf 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
@@ -18,6 +18,7 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
#include "MoveOnly.h"
struct ConstructsWithTupleLeaf
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp
index 635be614b9a..ee7cd066f7d 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp
@@ -19,6 +19,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct B
{
int id_;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/test_lazy_sfinae.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/test_lazy_sfinae.pass.cpp
index bdbe4fc4b44..15c4859615c 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/test_lazy_sfinae.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/test_lazy_sfinae.pass.cpp
@@ -16,6 +16,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
template <class ConstructFrom>
struct ConstructibleFromT {
ConstructibleFromT() = default;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/tuple_array_template_depth.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/tuple_array_template_depth.pass.cpp
index 2f9447f2a7d..318a4a3ddb8 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/tuple_array_template_depth.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/tuple_array_template_depth.pass.cpp
@@ -24,6 +24,8 @@
#include <array>
#include <tuple>
+#include "test_macros.h"
+
// Use 1256 to try and blow the template instantiation depth for all compilers.
typedef std::array<char, 1256> array_t;
typedef std::tuple<array_t> tuple_t;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp
index ae968403b01..c0d5698d1b9 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp
@@ -21,6 +21,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type.pass.cpp
index 7dd4e8f10ad..f0ea3f5c440 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type.pass.cpp
@@ -17,6 +17,8 @@
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::complex<float> cf;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple.include.array.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple.include.array.pass.cpp
index c3619f7949e..2236b6d1c29 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple.include.array.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple.include.array.pass.cpp
@@ -22,6 +22,8 @@
#include <array>
#include <type_traits>
+#include "test_macros.h"
+
template <class T, std::size_t N, class U, size_t idx>
void test()
{
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple.include.utility.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple.include.utility.pass.cpp
index fdfb8b8b0a8..458e4ffbc8c 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple.include.utility.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple.include.utility.pass.cpp
@@ -21,6 +21,8 @@
#include <utility>
#include <type_traits>
+#include "test_macros.h"
+
template <class T, std::size_t N, class U, size_t idx>
void test()
{
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size.pass.cpp
index f27c7eb470a..c7a31e9ce49 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size.pass.cpp
@@ -19,6 +19,8 @@
#include <tuple>
#include <type_traits>
+#include "test_macros.h"
+
template <class T, std::size_t N>
void test()
{
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_incomplete.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_incomplete.pass.cpp
index 32bad3317bc..f83ce7f13e7 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_incomplete.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_incomplete.pass.cpp
@@ -21,6 +21,8 @@
#include <array>
#include <type_traits>
+#include "test_macros.h"
+
template <class T, size_t Size = sizeof(std::tuple_size<T>)>
constexpr bool is_complete(int) { static_assert(Size > 0, ""); return true; }
template <class> constexpr bool is_complete(long) { return false; }
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_structured_bindings.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_structured_bindings.pass.cpp
index 28186a7914e..bbcdf616001 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_structured_bindings.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_structured_bindings.pass.cpp
@@ -22,6 +22,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
struct S { int x; };
void test_decomp_user_type() {
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_v.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_v.pass.cpp
index bd01f49497c..e5113e3a553 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_v.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_v.pass.cpp
@@ -16,6 +16,8 @@
#include <utility>
#include <array>
+#include "test_macros.h"
+
template <class Tuple, int Expect>
void test()
{
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_value_sfinae.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_value_sfinae.pass.cpp
index 2efbfa50e15..aad003039ec 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_value_sfinae.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_size_value_sfinae.pass.cpp
@@ -20,6 +20,8 @@
#include <tuple>
#include <type_traits>
+#include "test_macros.h"
+
template <class T, class = decltype(std::tuple_size<T>::value)>
constexpr bool has_value(int) { return true; }
template <class> constexpr bool has_value(long) { return false; }
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp
index eee8f18196a..24320848d26 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp
@@ -18,6 +18,7 @@
#include <tuple>
#include <cassert>
+#include "test_macros.h"
#include "MoveOnly.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp
index 951a8872609..3ebe950381b 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp
@@ -17,6 +17,7 @@
#include <tuple>
#include <cassert>
+#include "test_macros.h"
#include "MoveOnly.h"
int main(int, char**)
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.traits/uses_allocator.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.traits/uses_allocator.pass.cpp
index b04c491ede6..b22d09293f2 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.traits/uses_allocator.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.traits/uses_allocator.pass.cpp
@@ -18,6 +18,8 @@
#include <tuple>
#include <type_traits>
+#include "test_macros.h"
+
struct A {};
int main(int, char**)
diff --git a/libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp
index 710b33878d9..e663071e71e 100644
--- a/libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp
@@ -17,6 +17,8 @@
#include "poisoned_hash_helper.hpp"
+#include "test_macros.h"
+
int main(int, char**) {
test_library_hash_specializations_available();
diff --git a/libcxx/test/std/utilities/type.index/type.index.hash/hash.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.hash/hash.pass.cpp
index 8192a9020f7..0154ae55427 100644
--- a/libcxx/test/std/utilities/type.index/type.index.hash/hash.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.hash/hash.pass.cpp
@@ -21,6 +21,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::hash<std::type_index> H;
diff --git a/libcxx/test/std/utilities/type.index/type.index.members/ctor.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.members/ctor.pass.cpp
index c133130f10e..fd1ce7a36bd 100644
--- a/libcxx/test/std/utilities/type.index/type.index.members/ctor.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.members/ctor.pass.cpp
@@ -16,6 +16,8 @@
#include <typeindex>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::type_info const & info = typeid(int);
diff --git a/libcxx/test/std/utilities/type.index/type.index.members/eq.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.members/eq.pass.cpp
index 97f6448b73e..80ca023cb8d 100644
--- a/libcxx/test/std/utilities/type.index/type.index.members/eq.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.members/eq.pass.cpp
@@ -16,6 +16,8 @@
#include <typeindex>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::type_index t1 = typeid(int);
diff --git a/libcxx/test/std/utilities/type.index/type.index.members/hash_code.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.members/hash_code.pass.cpp
index 0619ff75443..f1ac930ef0a 100644
--- a/libcxx/test/std/utilities/type.index/type.index.members/hash_code.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.members/hash_code.pass.cpp
@@ -15,6 +15,8 @@
#include <typeindex>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
const std::type_info& ti = typeid(int);
diff --git a/libcxx/test/std/utilities/type.index/type.index.members/lt.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.members/lt.pass.cpp
index e24b3975e66..1697624f3e6 100644
--- a/libcxx/test/std/utilities/type.index/type.index.members/lt.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.members/lt.pass.cpp
@@ -18,6 +18,8 @@
#include <typeindex>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::type_index t1 = typeid(int);
diff --git a/libcxx/test/std/utilities/type.index/type.index.members/name.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.members/name.pass.cpp
index ee91629b35c..739e5d14174 100644
--- a/libcxx/test/std/utilities/type.index/type.index.members/name.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.members/name.pass.cpp
@@ -16,6 +16,8 @@
#include <string>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
const std::type_info& ti = typeid(int);
diff --git a/libcxx/test/std/utilities/type.index/type.index.overview/copy_assign.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.overview/copy_assign.pass.cpp
index 72cae39d045..94aa22e961c 100644
--- a/libcxx/test/std/utilities/type.index/type.index.overview/copy_assign.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.overview/copy_assign.pass.cpp
@@ -15,6 +15,8 @@
#include <typeindex>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::type_index t1(typeid(int));
diff --git a/libcxx/test/std/utilities/type.index/type.index.overview/copy_ctor.pass.cpp b/libcxx/test/std/utilities/type.index/type.index.overview/copy_ctor.pass.cpp
index df0df2e8c92..ebb56fae542 100644
--- a/libcxx/test/std/utilities/type.index/type.index.overview/copy_ctor.pass.cpp
+++ b/libcxx/test/std/utilities/type.index/type.index.overview/copy_ctor.pass.cpp
@@ -15,6 +15,8 @@
#include <typeindex>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
std::type_index t1(typeid(int));
diff --git a/libcxx/test/std/utilities/utility/as_const/as_const.pass.cpp b/libcxx/test/std/utilities/utility/as_const/as_const.pass.cpp
index 32d240a0b41..53cb11ef7e1 100644
--- a/libcxx/test/std/utilities/utility/as_const/as_const.pass.cpp
+++ b/libcxx/test/std/utilities/utility/as_const/as_const.pass.cpp
@@ -14,6 +14,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
struct S {int i;};
bool operator==(const S& x, const S& y) { return x.i == y.i; }
bool operator==(const volatile S& x, const volatile S& y) { return x.i == y.i; }
diff --git a/libcxx/test/std/utilities/utility/operators/rel_ops.pass.cpp b/libcxx/test/std/utilities/utility/operators/rel_ops.pass.cpp
index 42e80866562..52ed6422741 100644
--- a/libcxx/test/std/utilities/utility/operators/rel_ops.pass.cpp
+++ b/libcxx/test/std/utilities/utility/operators/rel_ops.pass.cpp
@@ -11,6 +11,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
struct A
{
int data_;
diff --git a/libcxx/test/std/utilities/utility/pairs/pair.astuple/get_rv.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pair.astuple/get_rv.pass.cpp
index e0ce55bba90..efa97c4aca0 100644
--- a/libcxx/test/std/utilities/utility/pairs/pair.astuple/get_rv.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pair.astuple/get_rv.pass.cpp
@@ -20,6 +20,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type.pass.cpp
index f2d3359e7a5..62a71bc8427 100644
--- a/libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type.pass.cpp
@@ -16,6 +16,8 @@
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::complex<float> cf;
diff --git a/libcxx/test/std/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp
index 1e41e3fda5d..9ff5e0fdf71 100644
--- a/libcxx/test/std/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp
@@ -14,6 +14,8 @@
#include <utility>
+#include "test_macros.h"
+
template <class T1, class T2>
void test()
{
diff --git a/libcxx/test/std/utilities/utility/pairs/pair.astuple/tuple_size.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pair.astuple/tuple_size.pass.cpp
index 3b95b4749dd..104f8981108 100644
--- a/libcxx/test/std/utilities/utility/pairs/pair.astuple/tuple_size.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pair.astuple/tuple_size.pass.cpp
@@ -14,6 +14,8 @@
#include <utility>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp
index 98f864caf1f..d70d060deb0 100644
--- a/libcxx/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp
@@ -19,6 +19,8 @@
#include <tuple>
#include <cassert>
+#include "test_macros.h"
+
class A
{
int i_;
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
index 0f22808de48..dc4cd317648 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
@@ -21,6 +21,8 @@
#include "archetypes.hpp"
#include "test_convertible.hpp"
+
+#include "test_macros.h"
using namespace ImplicitTypes; // Get implicitly archetypes
template <class T1, class T1Arg,
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair.pass.cpp
index f4dfe5e1b94..55ce0fced10 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair.pass.cpp
@@ -18,6 +18,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct NonAssignable {
NonAssignable& operator=(NonAssignable const&) = delete;
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair_cxx03.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair_cxx03.pass.cpp
index 47f85eaa6b4..96b4122cd5b 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair_cxx03.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_pair_cxx03.pass.cpp
@@ -18,6 +18,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct NonAssignable {
NonAssignable() {}
private:
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp
index b4f0c01094d..5ace94d971d 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp
@@ -18,6 +18,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
struct NonAssignable {
NonAssignable& operator=(NonAssignable const&) = delete;
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
index 0be0a4e9526..64e3adb56b7 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
@@ -19,6 +19,8 @@
#include <cassert>
#include <archetypes.hpp>
+#include "test_macros.h"
+
struct Base
{
virtual ~Base() {}
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
index e147d755856..53c6cc8a6f2 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
@@ -19,6 +19,8 @@
#include "archetypes.hpp"
#include "test_convertible.hpp"
+
+#include "test_macros.h"
using namespace ImplicitTypes; // Get implicitly archetypes
struct ExplicitT {
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second_cxx03.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second_cxx03.pass.cpp
index 880179723fb..394ee0fe568 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second_cxx03.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second_cxx03.pass.cpp
@@ -15,6 +15,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
class A
{
int data_;
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
index ce1e86c1a8b..5a592c35cbf 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
@@ -19,6 +19,8 @@
#include "archetypes.hpp"
#include "test_convertible.hpp"
+
+#include "test_macros.h"
using namespace ImplicitTypes; // Get implicitly archetypes
template <class T1, class U1,
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V_cxx03.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V_cxx03.pass.cpp
index 9f6498806f3..b18ced0f498 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V_cxx03.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V_cxx03.pass.cpp
@@ -15,6 +15,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp
index 26b02f383ad..5c6eb6e640d 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp
@@ -20,6 +20,8 @@
#include <tuple>
#include <utility>
+#include "test_macros.h"
+
int main(int, char**)
{
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp
index 0e3d9a1cb70..3d12398d6c9 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp
@@ -20,6 +20,8 @@
#include "archetypes.hpp"
#include "test_convertible.hpp"
+
+#include "test_macros.h"
using namespace ImplicitTypes; // Get implicitly archetypes
template <class T1, class U1,
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp
index db174e829bd..b1082ccfa65 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp
@@ -25,6 +25,8 @@
#include <tuple>
#include "archetypes.hpp"
+
+#include "test_macros.h"
using namespace ImplicitTypes; // Get implicitly archetypes
namespace ConstructorTest {
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/swap.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/swap.pass.cpp
index faaae1bc255..9a497e5ac53 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/swap.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/swap.pass.cpp
@@ -15,6 +15,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
struct S {
int i;
S() : i(0) {}
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/types.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/types.pass.cpp
index 25108de5bbe..cf62ec40205 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/types.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/types.pass.cpp
@@ -17,6 +17,8 @@
#include <utility>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**)
{
typedef std::pair<float, short*> P;
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.spec/non_member_swap.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.spec/non_member_swap.pass.cpp
index 87432767217..9aac80468d0 100644
--- a/libcxx/test/std/utilities/utility/pairs/pairs.spec/non_member_swap.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.spec/non_member_swap.pass.cpp
@@ -16,6 +16,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
int main(int, char**)
{
{
diff --git a/libcxx/test/std/utilities/utility/synopsis.pass.cpp b/libcxx/test/std/utilities/utility/synopsis.pass.cpp
index 5a703e1b2e5..e13a6bcf7c7 100644
--- a/libcxx/test/std/utilities/utility/synopsis.pass.cpp
+++ b/libcxx/test/std/utilities/utility/synopsis.pass.cpp
@@ -13,6 +13,8 @@
#include <utility>
+#include "test_macros.h"
+
int main(int, char**)
{
std::initializer_list<int> x;
diff --git a/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp b/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp
index 4cb79a22c7a..5caff3b1d19 100644
--- a/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp
@@ -29,6 +29,8 @@ public:
#include <type_traits>
#include <variant>
+#include "test_macros.h"
+
int main(int, char**) {
static_assert(std::is_base_of<std::exception, std::bad_variant_access>::value,
"");
diff --git a/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp b/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp
index 7e9ffbfa06e..2649dd6c4eb 100644
--- a/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp
@@ -17,6 +17,8 @@
#include "poisoned_hash_helper.hpp"
+#include "test_macros.h"
+
int main(int, char**) {
test_library_hash_specializations_available();
diff --git a/libcxx/test/std/utilities/variant/variant.helpers/variant_size.pass.cpp b/libcxx/test/std/utilities/variant/variant.helpers/variant_size.pass.cpp
index fb027fb6380..654e5a9dfe9 100644
--- a/libcxx/test/std/utilities/variant/variant.helpers/variant_size.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.helpers/variant_size.pass.cpp
@@ -22,6 +22,8 @@
#include <type_traits>
#include <variant>
+#include "test_macros.h"
+
template <class V, size_t E> void test() {
static_assert(std::variant_size<V>::value == E, "");
static_assert(std::variant_size<const V>::value == E, "");
diff --git a/libcxx/test/std/utilities/variant/variant.monostate/monostate.pass.cpp b/libcxx/test/std/utilities/variant/variant.monostate/monostate.pass.cpp
index 1ba75a77907..c726f684c35 100644
--- a/libcxx/test/std/utilities/variant/variant.monostate/monostate.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.monostate/monostate.pass.cpp
@@ -16,6 +16,8 @@
#include <type_traits>
#include <variant>
+#include "test_macros.h"
+
int main(int, char**) {
using M = std::monostate;
static_assert(std::is_trivially_default_constructible<M>::value, "");
diff --git a/libcxx/test/std/utilities/variant/variant.synopsis/variant_npos.pass.cpp b/libcxx/test/std/utilities/variant/variant.synopsis/variant_npos.pass.cpp
index 310b6980c1a..087c574a496 100644
--- a/libcxx/test/std/utilities/variant/variant.synopsis/variant_npos.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.synopsis/variant_npos.pass.cpp
@@ -15,6 +15,8 @@
#include <variant>
+#include "test_macros.h"
+
int main(int, char**) {
static_assert(std::variant_npos == static_cast<std::size_t>(-1), "");
OpenPOWER on IntegriCloud