summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/experimental
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/std/experimental')
-rw-r--r--libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/filesystem/fs.req.namespace/namespace.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/default.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pred.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/pred.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/default.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pred.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/pred.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/func/header.functional.synop/includes.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/iterator/nothing_to_do.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/assign.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/construct.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.noop/noop_coroutine.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/void_handle.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/coroutine.traits/promise_type.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/expected.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/go.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/multishot_func.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/language.support/support.coroutines/includes.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/assign.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/copy.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/default.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/memory_resource_convert.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/other_alloc.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/equal.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/not_equal.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/deallocate.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/destroy.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/resource.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/select_on_container_copy_construction.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_copy.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_move.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/default.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_is_equal.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.overview/overview.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_deque_synop.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_forward_list_synop.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_list_synop.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_map_synop.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_regex_synop.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_set_synop.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_string_synop.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_map_synop.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_vector_synop.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.global/default_resource.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/not_equal.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/deallocate.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/dtor.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/is_equal.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/simd/simd.abi/vector_extension.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/simd/simd.access/default.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/simd/simd.casts/simd_cast.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/simd/simd.casts/static_simd_cast.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/simd/simd.cons/broadcast.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/simd/simd.cons/default.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/simd/simd.cons/generator.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/simd/simd.traits/abi_for_size.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_convertible_element_type.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_convertible_propagate_const.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_element_type.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign_convertible.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign_convertible_propagate_const.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_element_type.explicit.ctor.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_element_type.non-explicit.ctor.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.copy_ctor.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.explicit.move_ctor.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.move_ctor.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/copy_ctor.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/element_type.explicit.ctor.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/element_type.non-explicit.ctor.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/move_ctor.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/dereference.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/explicit_operator_element_type_ptr.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/get.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/op_arrow.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/operator_element_type_ptr.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/dereference.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/explicit_operator_element_type_ptr.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/get.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/op_arrow.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/operator_element_type_ptr.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/swap.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/hash.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/equal_to.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/greater.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/greater_equal.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/less.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/less_equal.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/not_equal_to.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/equal.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/greater_equal.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/greater_than.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/less_equal.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/less_than.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/not_equal.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/swap.pass.cpp1
-rw-r--r--libcxx/test/std/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/utilities/utility/utility.synop/includes.pass.cpp2
114 files changed, 172 insertions, 0 deletions
diff --git a/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp b/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp
index 45b1f09729b..47e041f055b 100644
--- a/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp
+++ b/libcxx/test/std/experimental/algorithms/alg.search/search.pass.cpp
@@ -20,6 +20,7 @@
#include <experimental/algorithm>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
int searcher_called = 0;
diff --git a/libcxx/test/std/experimental/filesystem/fs.req.namespace/namespace.pass.cpp b/libcxx/test/std/experimental/filesystem/fs.req.namespace/namespace.pass.cpp
index 87086d42958..c9f89b322ec 100644
--- a/libcxx/test/std/experimental/filesystem/fs.req.namespace/namespace.pass.cpp
+++ b/libcxx/test/std/experimental/filesystem/fs.req.namespace/namespace.pass.cpp
@@ -15,6 +15,8 @@
#include <experimental/filesystem>
#include <type_traits>
+#include "test_macros.h"
+
int main(int, char**) {
static_assert(std::is_same<
std::experimental::filesystem::path,
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/default.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/default.pass.cpp
index 35c5e50bbe7..4feda6e22d7 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/default.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/default.pass.cpp
@@ -35,6 +35,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename Iter1, typename Iter2>
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pass.cpp
index 245b3ddfc7f..8aad52d5719 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pass.cpp
@@ -35,6 +35,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename T> struct MyHash {
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pred.pass.cpp
index ad90954758e..5b637210841 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pred.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/hash.pred.pass.cpp
@@ -35,6 +35,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename T> struct MyHash {
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/pred.pass.cpp
index a361b90b852..8dc3d2eddfd 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/pred.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore/pred.pass.cpp
@@ -35,6 +35,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
struct count_equal
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/default.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/default.pass.cpp
index 95426f81c88..ed3d5737869 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/default.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/default.pass.cpp
@@ -35,6 +35,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename Iter1, typename Iter2>
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pass.cpp
index 151a0f46b41..7552382f08b 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pass.cpp
@@ -34,6 +34,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename T> struct MyHash {
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pred.pass.cpp
index bcdaa87c4a4..36ed6575dea 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pred.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/hash.pred.pass.cpp
@@ -34,6 +34,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename T> struct MyHash {
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/pred.pass.cpp
index 06a93c5d7b7..82d4de2001e 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/pred.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.boyer_moore_horspool/pred.pass.cpp
@@ -34,6 +34,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
struct count_equal
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp
index b3f6c66387f..d5e7b6092ac 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pass.cpp
@@ -35,6 +35,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename Iter1, typename Iter2>
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp
index f1573a2e067..052ce5b05a0 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/default.pred.pass.cpp
@@ -35,6 +35,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
struct count_equal
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp
index 5187569ecf3..a846095741a 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pass.cpp
@@ -20,6 +20,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
template <typename Iter1, typename Iter2>
diff --git a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp
index a6996437ec1..b2465accd5f 100644
--- a/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp
+++ b/libcxx/test/std/experimental/func/func.searchers/func.searchers.default/func.searchers.default.creation/make_default_searcher.pred.pass.cpp
@@ -20,6 +20,7 @@
#include <experimental/functional>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
struct count_equal
diff --git a/libcxx/test/std/experimental/func/header.functional.synop/includes.pass.cpp b/libcxx/test/std/experimental/func/header.functional.synop/includes.pass.cpp
index 4b913c2d780..e62c52576f0 100644
--- a/libcxx/test/std/experimental/func/header.functional.synop/includes.pass.cpp
+++ b/libcxx/test/std/experimental/func/header.functional.synop/includes.pass.cpp
@@ -14,6 +14,8 @@
#include <experimental/functional>
+#include "test_macros.h"
+
int main(int, char**)
{
std::function<int(int)> x;
diff --git a/libcxx/test/std/experimental/iterator/nothing_to_do.pass.cpp b/libcxx/test/std/experimental/iterator/nothing_to_do.pass.cpp
index 782c1a03ee5..1cd92d047c4 100644
--- a/libcxx/test/std/experimental/iterator/nothing_to_do.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/nothing_to_do.pass.cpp
@@ -8,6 +8,8 @@
#include <experimental/iterator>
+#include "test_macros.h"
+
int main(int, char**) {
return 0;
}
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/assign.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/assign.pass.cpp
index 2af0b717ea6..b1ebf2ab804 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/assign.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/assign.pass.cpp
@@ -20,6 +20,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace coro = std::experimental;
template <class C>
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/construct.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/construct.pass.cpp
index 7832856c1cf..81096376189 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/construct.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.con/construct.pass.cpp
@@ -21,6 +21,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace coro = std::experimental;
template <class C>
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.pass.cpp
index 9c4a647e5fc..398fe725d64 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.export/from_address.pass.cpp
@@ -20,6 +20,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace coro = std::experimental;
template <class C>
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.noop/noop_coroutine.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.noop/noop_coroutine.pass.cpp
index 27b83ce02e1..bc16f3f72c5 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.noop/noop_coroutine.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/coroutine.handle.noop/noop_coroutine.pass.cpp
@@ -19,6 +19,8 @@
#include <cassert>
#include <type_traits>
+#include "test_macros.h"
+
#if __has_builtin(__builtin_coro_noop)
namespace coro = std::experimental::coroutines_v1;
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/void_handle.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/void_handle.pass.cpp
index 8536e23d462..8a0f5206391 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/void_handle.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.handle/void_handle.pass.cpp
@@ -11,6 +11,8 @@
#include <experimental/coroutine>
+#include "test_macros.h"
+
namespace coro = std::experimental;
struct A {
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.traits/promise_type.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.traits/promise_type.pass.cpp
index 781f264ffd7..95248ac664b 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.traits/promise_type.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/coroutine.traits/promise_type.pass.cpp
@@ -11,6 +11,8 @@
#include <experimental/coroutine>
+#include "test_macros.h"
+
namespace coro = std::experimental;
template <class T, class = typename T::promise_type>
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp
index c540ca9fb35..e181c2517c4 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/await_result.pass.cpp
@@ -12,6 +12,8 @@
#include <experimental/coroutine>
#include <cassert>
+#include "test_macros.h"
+
using namespace std::experimental;
struct coro_t {
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
index fb15ade8bb2..0fc02f5e317 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/bool_await_suspend.pass.cpp
@@ -15,6 +15,8 @@
#include <experimental/coroutine>
#include <cassert>
+#include "test_macros.h"
+
using namespace std::experimental;
struct coro_t {
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/expected.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/expected.pass.cpp
index a899092d034..07fcee36965 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/expected.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/expected.pass.cpp
@@ -11,6 +11,8 @@
#include <experimental/coroutine>
#include <cassert>
+
+#include "test_macros.h"
using namespace std::experimental;
struct error {};
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp
index 84b4deb9ce4..c0ac5ecc0b5 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/generator.pass.cpp
@@ -16,6 +16,7 @@
#include <vector>
#include <cassert>
+#include "test_macros.h"
#include "coroutine_types.h"
using namespace std::experimental;
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/go.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/go.pass.cpp
index 994bd87d6de..82174d56cf2 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/go.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/go.pass.cpp
@@ -12,6 +12,8 @@
#include <experimental/coroutine>
#include <cassert>
+#include "test_macros.h"
+
using namespace std::experimental;
bool cancel = false;
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/multishot_func.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/multishot_func.pass.cpp
index fed97ea2308..a346497b437 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/multishot_func.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/multishot_func.pass.cpp
@@ -12,6 +12,8 @@
#include <experimental/coroutine>
#include <cassert>
+#include "test_macros.h"
+
using namespace std::experimental;
// This file tests, multishot, movable std::function like thing using coroutine
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
index 4bab2dd3bf2..91cc1373752 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/end.to.end/oneshot_func.pass.cpp
@@ -13,6 +13,8 @@
#include <vector>
#include <cassert>
+#include "test_macros.h"
+
using namespace std::experimental;
// This file tests, one shot, movable std::function like thing using coroutine
diff --git a/libcxx/test/std/experimental/language.support/support.coroutines/includes.pass.cpp b/libcxx/test/std/experimental/language.support/support.coroutines/includes.pass.cpp
index 440ffa113a1..7997add41d8 100644
--- a/libcxx/test/std/experimental/language.support/support.coroutines/includes.pass.cpp
+++ b/libcxx/test/std/experimental/language.support/support.coroutines/includes.pass.cpp
@@ -19,6 +19,7 @@ int main(int, char**) {
// std::nothrow is not implicitly defined by the compiler when the include is
// missing, unlike other parts of <new>. Therefore we use std::nothrow to
// test for #include <new>
+
(void)std::nothrow;
return 0;
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/assign.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/assign.pass.cpp
index 35a98b789ef..320599d089b 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/assign.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/assign.pass.cpp
@@ -18,6 +18,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/copy.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/copy.pass.cpp
index ce3c9be105d..c7839dcb699 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/copy.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/copy.pass.cpp
@@ -18,6 +18,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/default.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/default.pass.cpp
index 59d234eea1e..90efbf46c97 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/default.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/default.pass.cpp
@@ -20,6 +20,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/memory_resource_convert.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/memory_resource_convert.pass.cpp
index 77748ea122a..d0d33b3b002 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/memory_resource_convert.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/memory_resource_convert.pass.cpp
@@ -20,6 +20,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/other_alloc.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/other_alloc.pass.cpp
index 21a56f67b5f..aeb3a554efa 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/other_alloc.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/other_alloc.pass.cpp
@@ -20,6 +20,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/equal.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/equal.pass.cpp
index 8b9c976f86d..8b216e1c546 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/equal.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/equal.pass.cpp
@@ -23,6 +23,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/not_equal.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/not_equal.pass.cpp
index e6489be2c36..803e9a0ba69 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/not_equal.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/not_equal.pass.cpp
@@ -23,6 +23,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair.pass.cpp
index 4102fa93aa1..de8a26195d5 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair.pass.cpp
@@ -23,6 +23,8 @@
#include <cstdlib>
#include "uses_alloc_types.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int constructed = 0;
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/deallocate.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/deallocate.pass.cpp
index 9de134008c4..5677b868cb9 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/deallocate.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/deallocate.pass.cpp
@@ -20,6 +20,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
template <size_t S, size_t Align>
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/destroy.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/destroy.pass.cpp
index 2f6853c7848..b9b482b21ee 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/destroy.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/destroy.pass.cpp
@@ -21,6 +21,8 @@
#include <cassert>
#include <cstdlib>
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int count = 0;
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/resource.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/resource.pass.cpp
index 0883b2c5102..16f8f6743f7 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/resource.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/resource.pass.cpp
@@ -19,6 +19,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/select_on_container_copy_construction.pass.cpp b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/select_on_container_copy_construction.pass.cpp
index 9998e58efba..e15c3ebd40d 100644
--- a/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/select_on_container_copy_construction.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/select_on_container_copy_construction.pass.cpp
@@ -19,6 +19,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_copy.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_copy.pass.cpp
index 4466b2b4e51..e8d9c77bcc2 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_copy.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_copy.pass.cpp
@@ -19,6 +19,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_move.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_move.pass.cpp
index b6af8515100..959ec44049f 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_move.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_move.pass.cpp
@@ -19,6 +19,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/default.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/default.pass.cpp
index 53481ab39f2..2885a39a558 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/default.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/default.pass.cpp
@@ -21,6 +21,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_is_equal.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_is_equal.pass.cpp
index 71c36693c3c..f9879780398 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_is_equal.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_is_equal.pass.cpp
@@ -20,6 +20,8 @@
#include <cassert>
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
using std::size_t;
namespace ex = std::experimental::pmr;
diff --git a/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.overview/overview.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.overview/overview.pass.cpp
index 873dfd9391c..1691025848c 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.overview/overview.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.overview/overview.pass.cpp
@@ -17,6 +17,8 @@
#include <memory>
#include <cassert>
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_deque_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_deque_synop.pass.cpp
index 6b5a3fbd542..7527ac3420d 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_deque_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_deque_synop.pass.cpp
@@ -23,6 +23,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace pmr = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_forward_list_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_forward_list_synop.pass.cpp
index 5104c44dc72..7fd09e49640 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_forward_list_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_forward_list_synop.pass.cpp
@@ -23,6 +23,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace pmr = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_list_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_list_synop.pass.cpp
index e865e28f3b3..39f9cae6741 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_list_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_list_synop.pass.cpp
@@ -23,6 +23,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace pmr = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_map_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_map_synop.pass.cpp
index bb3016f9315..d7b0e5e8e15 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_map_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_map_synop.pass.cpp
@@ -27,6 +27,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace pmr = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_regex_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_regex_synop.pass.cpp
index d0f62e57f3c..751847e0ea2 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_regex_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_regex_synop.pass.cpp
@@ -29,6 +29,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace pmr = std::experimental::pmr;
template <class Iter, class PmrTypedef>
diff --git a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_set_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_set_synop.pass.cpp
index 3bfd5fd6a23..ce97287e123 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_set_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_set_synop.pass.cpp
@@ -27,6 +27,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace pmr = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_string_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_string_synop.pass.cpp
index b3fdbde6d3e..faf1f85f053 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_string_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_string_synop.pass.cpp
@@ -30,6 +30,8 @@
#include "constexpr_char_traits.hpp"
+#include "test_macros.h"
+
namespace pmr = std::experimental::pmr;
template <class Char, class PmrTypedef>
diff --git a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_map_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_map_synop.pass.cpp
index 60a7c5c7366..6487eb09a09 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_map_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_map_synop.pass.cpp
@@ -27,6 +27,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace pmr = std::experimental::pmr;
template <class T>
diff --git a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp
index a090c2efa3b..a9325679799 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp
@@ -27,6 +27,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace pmr = std::experimental::pmr;
template <class T>
diff --git a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_vector_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_vector_synop.pass.cpp
index 9cedde94b0e..c85b231d123 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_vector_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_vector_synop.pass.cpp
@@ -23,6 +23,8 @@
#include <type_traits>
#include <cassert>
+#include "test_macros.h"
+
namespace pmr = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource.global/default_resource.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.global/default_resource.pass.cpp
index df32a4dcf64..ac2726ef9a7 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.global/default_resource.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.global/default_resource.pass.cpp
@@ -33,6 +33,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
using namespace std::experimental::pmr;
int main(int, char**) {
diff --git a/libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp
index ab0fedcb8f7..9b9c505e6e4 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp
@@ -18,6 +18,8 @@
#include "count_new.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
struct assert_on_compare : public ex::memory_resource
diff --git a/libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/not_equal.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/not_equal.pass.cpp
index 037bb1a9613..3f5e35558a2 100644
--- a/libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/not_equal.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/not_equal.pass.cpp
@@ -18,6 +18,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
namespace ex = std::experimental::pmr;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/deallocate.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/deallocate.pass.cpp
index e8c2d5bfff1..c315508d66f 100644
--- a/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/deallocate.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/deallocate.pass.cpp
@@ -28,6 +28,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
using std::experimental::pmr::memory_resource;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/dtor.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/dtor.pass.cpp
index be5ea2fb008..b017c355662 100644
--- a/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/dtor.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/dtor.pass.cpp
@@ -24,6 +24,8 @@
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
using std::experimental::pmr::memory_resource;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/is_equal.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/is_equal.pass.cpp
index f0e51787085..9f66b8adcb6 100644
--- a/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/is_equal.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/is_equal.pass.cpp
@@ -26,6 +26,8 @@
#include <cassert>
#include "test_memory_resource.hpp"
+#include "test_macros.h"
+
using std::experimental::pmr::memory_resource;
int main(int, char**)
diff --git a/libcxx/test/std/experimental/simd/simd.abi/vector_extension.pass.cpp b/libcxx/test/std/experimental/simd/simd.abi/vector_extension.pass.cpp
index 6bd56d2dda7..6e9a16611a9 100644
--- a/libcxx/test/std/experimental/simd/simd.abi/vector_extension.pass.cpp
+++ b/libcxx/test/std/experimental/simd/simd.abi/vector_extension.pass.cpp
@@ -15,6 +15,8 @@
#include <experimental/simd>
#include <cstdint>
+#include "test_macros.h"
+
namespace ex = std::experimental::parallelism_v2;
constexpr inline int reg_width() {
diff --git a/libcxx/test/std/experimental/simd/simd.access/default.pass.cpp b/libcxx/test/std/experimental/simd/simd.access/default.pass.cpp
index 6e6e4fe9e9a..c617344a5a1 100644
--- a/libcxx/test/std/experimental/simd/simd.access/default.pass.cpp
+++ b/libcxx/test/std/experimental/simd/simd.access/default.pass.cpp
@@ -18,6 +18,8 @@
#include <cassert>
#include <cstdint>
+#include "test_macros.h"
+
namespace ex = std::experimental::parallelism_v2;
template <typename SimdType>
diff --git a/libcxx/test/std/experimental/simd/simd.casts/simd_cast.pass.cpp b/libcxx/test/std/experimental/simd/simd.casts/simd_cast.pass.cpp
index ec4a32bf9d7..1e7fe02f8da 100644
--- a/libcxx/test/std/experimental/simd/simd.casts/simd_cast.pass.cpp
+++ b/libcxx/test/std/experimental/simd/simd.casts/simd_cast.pass.cpp
@@ -17,6 +17,8 @@
#include <experimental/simd>
#include <cstdint>
+#include "test_macros.h"
+
namespace ex = std::experimental::parallelism_v2;
static_assert(
diff --git a/libcxx/test/std/experimental/simd/simd.casts/static_simd_cast.pass.cpp b/libcxx/test/std/experimental/simd/simd.casts/static_simd_cast.pass.cpp
index 40922ce1153..55258bd59bd 100644
--- a/libcxx/test/std/experimental/simd/simd.casts/static_simd_cast.pass.cpp
+++ b/libcxx/test/std/experimental/simd/simd.casts/static_simd_cast.pass.cpp
@@ -17,6 +17,8 @@
#include <experimental/simd>
#include <cstdint>
+#include "test_macros.h"
+
namespace ex = std::experimental::parallelism_v2;
static_assert(
diff --git a/libcxx/test/std/experimental/simd/simd.cons/broadcast.pass.cpp b/libcxx/test/std/experimental/simd/simd.cons/broadcast.pass.cpp
index 25dd8a4c534..cf038e38427 100644
--- a/libcxx/test/std/experimental/simd/simd.cons/broadcast.pass.cpp
+++ b/libcxx/test/std/experimental/simd/simd.cons/broadcast.pass.cpp
@@ -19,6 +19,8 @@
#include <cstdint>
#include <experimental/simd>
+#include "test_macros.h"
+
namespace ex = std::experimental::parallelism_v2;
template <class T, class... Args>
diff --git a/libcxx/test/std/experimental/simd/simd.cons/default.pass.cpp b/libcxx/test/std/experimental/simd/simd.cons/default.pass.cpp
index 6eebe0ec0cf..3e6200bb171 100644
--- a/libcxx/test/std/experimental/simd/simd.cons/default.pass.cpp
+++ b/libcxx/test/std/experimental/simd/simd.cons/default.pass.cpp
@@ -16,6 +16,8 @@
#include <cstdint>
#include <experimental/simd>
+#include "test_macros.h"
+
namespace ex = std::experimental::parallelism_v2;
int main(int, char**) {
diff --git a/libcxx/test/std/experimental/simd/simd.cons/generator.pass.cpp b/libcxx/test/std/experimental/simd/simd.cons/generator.pass.cpp
index 19880e9d301..500ccce817d 100644
--- a/libcxx/test/std/experimental/simd/simd.cons/generator.pass.cpp
+++ b/libcxx/test/std/experimental/simd/simd.cons/generator.pass.cpp
@@ -19,6 +19,8 @@
#include <experimental/simd>
#include <cstdint>
+#include "test_macros.h"
+
namespace ex = std::experimental::parallelism_v2;
template <class T, class... Args>
diff --git a/libcxx/test/std/experimental/simd/simd.traits/abi_for_size.pass.cpp b/libcxx/test/std/experimental/simd/simd.traits/abi_for_size.pass.cpp
index 2bf28dc8a21..ba4e07cf928 100644
--- a/libcxx/test/std/experimental/simd/simd.traits/abi_for_size.pass.cpp
+++ b/libcxx/test/std/experimental/simd/simd.traits/abi_for_size.pass.cpp
@@ -18,6 +18,8 @@
#include <cstdint>
#include <experimental/simd>
+#include "test_macros.h"
+
namespace ex = std::experimental::parallelism_v2;
static_assert(std::is_same<typename ex::abi_for_size<int, 4>::type,
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign.pass.cpp
index 078c8c7f067..be9879e2526 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> propagate_const& propagate_const::operator=(const propagate_const<U>&)=delete;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <type_traits>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_convertible_element_type.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_convertible_element_type.pass.cpp
index 512b5998138..d3f5f03c67e 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_convertible_element_type.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_convertible_element_type.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> propagate_const& propagate_const::operator=(U&&);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_convertible_propagate_const.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_convertible_propagate_const.pass.cpp
index 0da532ab4a2..1fa0dd08c90 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_convertible_propagate_const.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_convertible_propagate_const.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> constexpr propagate_const& operator=(U&& u); // won't bind to propagate_const
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <type_traits>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_element_type.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_element_type.pass.cpp
index 896ef9c90b9..2743f577426 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_element_type.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/assign_element_type.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> propagate_const& propagate_const::operator=(U&&);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign.pass.cpp
index f1546afcc5f..2d63e3c0fa3 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> propagate_const& propagate_const::operator=(propagate_const<U>&&);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign_convertible.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign_convertible.pass.cpp
index dfff0bc9350..fcd1342b12c 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign_convertible.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign_convertible.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> propagate_const& propagate_const::operator=(propagate_const<U>&&);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign_convertible_propagate_const.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign_convertible_propagate_const.pass.cpp
index 894910eaa87..f382e5ec2ec 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign_convertible_propagate_const.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.assignment/move_assign_convertible_propagate_const.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> constexpr propagate_const& operator=(propagate_const<_Up>&& pu);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_element_type.explicit.ctor.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_element_type.explicit.ctor.pass.cpp
index 24e27cb6b56..f9d1a81bfba 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_element_type.explicit.ctor.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_element_type.explicit.ctor.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> constexpr propagate_const& operator=(propagate_const<_Up>&& pu);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <type_traits>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_element_type.non-explicit.ctor.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_element_type.non-explicit.ctor.pass.cpp
index 9cb325db00f..f05cc696a2f 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_element_type.non-explicit.ctor.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_element_type.non-explicit.ctor.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> constexpr propagate_const(propagate_const<_Up>&& pu);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.copy_ctor.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.copy_ctor.pass.cpp
index e440245b5e4..af798180931 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.copy_ctor.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.copy_ctor.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> constexpr propagate_const& operator(propagate_const<_Up>&& pu);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <type_traits>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.explicit.move_ctor.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.explicit.move_ctor.pass.cpp
index 3166ebe70c1..7ea0c1f33fc 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.explicit.move_ctor.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.explicit.move_ctor.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> constexpr propagate_const(propagate_const<_Up>&& pu);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <type_traits>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.move_ctor.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.move_ctor.pass.cpp
index ea1ac4262f3..277460da859 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.move_ctor.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/convertible_propagate_const.move_ctor.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> constexpr propagate_const(propagate_const<_Up>&& pu);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/copy_ctor.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/copy_ctor.pass.cpp
index 7c0558f398f..bed1f6b212d 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/copy_ctor.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/copy_ctor.pass.cpp
@@ -13,6 +13,7 @@
// propagate_const(const propagate_const&)=delete;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <type_traits>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/element_type.explicit.ctor.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/element_type.explicit.ctor.pass.cpp
index aee637620a7..3eb078e8613 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/element_type.explicit.ctor.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/element_type.explicit.ctor.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> propagate_const(U&&);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <type_traits>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/element_type.non-explicit.ctor.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/element_type.non-explicit.ctor.pass.cpp
index 93e50578a97..580d33d2057 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/element_type.non-explicit.ctor.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/element_type.non-explicit.ctor.pass.cpp
@@ -13,6 +13,7 @@
// template <class U> propagate_const(U&&);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/move_ctor.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/move_ctor.pass.cpp
index 662a605f49c..24fc665af33 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/move_ctor.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.ctors/move_ctor.pass.cpp
@@ -13,6 +13,7 @@
// propagate_const(propagate_const&&)=default;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/dereference.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/dereference.pass.cpp
index 4e47bac3715..261d0cbb2f8 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/dereference.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/dereference.pass.cpp
@@ -13,6 +13,7 @@
// element_type& propagate_const::operator*();
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/explicit_operator_element_type_ptr.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/explicit_operator_element_type_ptr.pass.cpp
index 6ce5d407c58..08126f27cf1 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/explicit_operator_element_type_ptr.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/explicit_operator_element_type_ptr.pass.cpp
@@ -13,6 +13,7 @@
// propagate_const::operator element_type*();
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <type_traits>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/get.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/get.pass.cpp
index 1a12c3bdd3d..79c43255f53 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/get.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/get.pass.cpp
@@ -13,6 +13,7 @@
// element_type* propagate_const::get();
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/op_arrow.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/op_arrow.pass.cpp
index bdc6c693730..ea6fe1645b2 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/op_arrow.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/op_arrow.pass.cpp
@@ -13,6 +13,7 @@
// element_type* propagate_const::operator->();
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/operator_element_type_ptr.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/operator_element_type_ptr.pass.cpp
index 46244b39172..176ca724485 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/operator_element_type_ptr.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.non-const_observers/operator_element_type_ptr.pass.cpp
@@ -13,6 +13,7 @@
// propagate_const::operator element_type*();
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/dereference.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/dereference.pass.cpp
index 758bca4694e..17b7fa64e32 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/dereference.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/dereference.pass.cpp
@@ -13,6 +13,7 @@
// const element_type& propagate_const::operator*() const;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/explicit_operator_element_type_ptr.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/explicit_operator_element_type_ptr.pass.cpp
index 1f98f03d2fa..d1f4bc55d67 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/explicit_operator_element_type_ptr.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/explicit_operator_element_type_ptr.pass.cpp
@@ -13,6 +13,7 @@
// propagate_const::operator const element_type*() const;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <type_traits>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/get.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/get.pass.cpp
index 71aea68edc2..ce053fdfd5c 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/get.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/get.pass.cpp
@@ -13,6 +13,7 @@
// const element_type* propagate_const::get() const;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/op_arrow.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/op_arrow.pass.cpp
index dcb1b924557..f8916aecae4 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/op_arrow.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/op_arrow.pass.cpp
@@ -13,6 +13,7 @@
// const element_type* propagate_const::operator->() const;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/operator_element_type_ptr.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/operator_element_type_ptr.pass.cpp
index bfd295a1fa0..652ef2b853f 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/operator_element_type_ptr.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/propagate_const.observers/operator_element_type_ptr.pass.cpp
@@ -13,6 +13,7 @@
// propagate_const::operator const element_type*() const;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/swap.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/swap.pass.cpp
index 03b32dd0ec6..930f9469caa 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/swap.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.class/swap.pass.cpp
@@ -13,6 +13,7 @@
// template <class T> constexpr void propagate_const::swap(propagate_const<T>& x);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/hash.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/hash.pass.cpp
index 28ac9c22460..6cc5dce42eb 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/hash.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/hash.pass.cpp
@@ -13,6 +13,7 @@
// template <class T> struct hash<experimental::fundamentals_v2::propagate_const<T>>;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/equal_to.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/equal_to.pass.cpp
index 85e40050476..2374a745863 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/equal_to.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/equal_to.pass.cpp
@@ -13,6 +13,7 @@
// template <class T> struct equal_to<experimental::fundamentals_v2::propagate_const<T>>;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/greater.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/greater.pass.cpp
index ab7b5e9a21d..7ba3922ab28 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/greater.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/greater.pass.cpp
@@ -13,6 +13,7 @@
// template <class T> struct greater<experimental::fundamentals_v2::propagate_const<T>>;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/greater_equal.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/greater_equal.pass.cpp
index f30e0e9d22e..04564719c7c 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/greater_equal.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/greater_equal.pass.cpp
@@ -13,6 +13,7 @@
// template <class T> struct greater_equal<experimental::fundamentals_v2::propagate_const<T>>;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/less.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/less.pass.cpp
index 75afd95e115..4bd7064c162 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/less.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/less.pass.cpp
@@ -13,6 +13,7 @@
// template <class T> struct less<experimental::fundamentals_v2::propagate_const<T>>;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/less_equal.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/less_equal.pass.cpp
index 4f6523a320f..929b089445e 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/less_equal.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/less_equal.pass.cpp
@@ -13,6 +13,7 @@
// template <class T> struct less_equal<experimental::fundamentals_v2::propagate_const<T>>;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/not_equal_to.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/not_equal_to.pass.cpp
index 1c303ae28db..273ab12678e 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/not_equal_to.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.comparison_function_objects/not_equal_to.pass.cpp
@@ -13,6 +13,7 @@
// template <class T> struct not_equal_to<experimental::fundamentals_v2::propagate_const<T>>;
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/equal.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/equal.pass.cpp
index dafc355a48e..59b27546cb5 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/equal.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/equal.pass.cpp
@@ -15,6 +15,7 @@
// template <class T> constexpr bool operator==(const propagate_const<T>& x, const T& y);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/greater_equal.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/greater_equal.pass.cpp
index 36f3747303e..685a633570e 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/greater_equal.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/greater_equal.pass.cpp
@@ -15,6 +15,7 @@
// template <class T> constexpr bool operator>=(const propagate_const<T>& x, const T& y);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/greater_than.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/greater_than.pass.cpp
index 6abadb39b23..9dfad677d8c 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/greater_than.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/greater_than.pass.cpp
@@ -15,6 +15,7 @@
// template <class T> constexpr bool operator>(const propagate_const<T>& x, const T& y);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/less_equal.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/less_equal.pass.cpp
index 703faed74e5..ac8319e5b0f 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/less_equal.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/less_equal.pass.cpp
@@ -15,6 +15,7 @@
// template <class T> constexpr bool operator<=(const propagate_const<T>& x, const T& y);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/less_than.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/less_than.pass.cpp
index 7481418d384..0bdc3377a63 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/less_than.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/less_than.pass.cpp
@@ -15,6 +15,7 @@
// template <class T> constexpr bool operator<(const propagate_const<T>& x, const T& y);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/not_equal.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/not_equal.pass.cpp
index ebfc6231557..0045690df37 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/not_equal.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/propagate_const.relops/not_equal.pass.cpp
@@ -15,6 +15,7 @@
// template <class T> constexpr bool operator!=(const propagate_const<T>& x, const T& y);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/swap.pass.cpp b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/swap.pass.cpp
index 84923f78dc1..dcb294adee7 100644
--- a/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/swap.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/propagate_const/propagate_const.nonmembers/swap.pass.cpp
@@ -13,6 +13,7 @@
// template <class T> constexpr void swap(propagate_const<T>& x, propagate_const<T>& y);
#include <experimental/propagate_const>
+#include "test_macros.h"
#include "propagate_const_helpers.h"
#include <cassert>
diff --git a/libcxx/test/std/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp b/libcxx/test/std/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
index 36bf4f793b4..3f2243425d3 100644
--- a/libcxx/test/std/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
@@ -10,6 +10,8 @@
#include <experimental/utility>
+#include "test_macros.h"
+
int main(int, char**)
{
std::experimental::erased_type e;
diff --git a/libcxx/test/std/experimental/utilities/utility/utility.synop/includes.pass.cpp b/libcxx/test/std/experimental/utilities/utility/utility.synop/includes.pass.cpp
index ddf053f2429..7e27adfab19 100644
--- a/libcxx/test/std/experimental/utilities/utility/utility.synop/includes.pass.cpp
+++ b/libcxx/test/std/experimental/utilities/utility/utility.synop/includes.pass.cpp
@@ -10,6 +10,8 @@
#include <experimental/utility>
+#include "test_macros.h"
+
#ifndef _LIBCPP_UTILITY
# error "<experimental/utility> must include <utility>"
#endif
OpenPOWER on IntegriCloud