Add include for 'test_macros.h' to all the tests that were missing them. Thanks to Zoe for the (big, but simple) patch. NFC intended.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@362252 91177308-0d34-0410-b5e6-96231b3b80d8

test/libcxx/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.cxx1z.pass.cpp

@@ -31,6 +31,8 @@
 #include <algorithm>
 #include <vector>
 
+#include "test_macros.h"
+
 struct gen
 {
     std::ptrdiff_t operator()(std::ptrdiff_t n)

test/libcxx/algorithms/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <algorithm>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/atomics/atomics.order/memory_order.underlying_type.pass.cpp

@@ -18,6 +18,8 @@
 #include <atomic>
 #include <type_traits>
 
+#include "test_macros.h"
+
 
 enum cpp17_memory_order {
   cpp17_memory_order_relaxed, cpp17_memory_order_consume, cpp17_memory_order_acquire,

test/libcxx/atomics/version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <atomic>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/associative/map/at.abort.pass.cpp

@@ -21,6 +21,8 @@
 #include <cstdlib>
 #include <map>
 
+#include "test_macros.h"
+
 
 void exit_success(int) {
     std::_Exit(EXIT_SUCCESS);

test/libcxx/containers/associative/map/at.const.abort.pass.cpp

@@ -21,6 +21,8 @@
 #include <cstdlib>
 #include <map>
 
+#include "test_macros.h"
+
 
 void exit_success(int) {
     std::_Exit(EXIT_SUCCESS);

test/libcxx/containers/associative/map/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <map>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/associative/non_const_comparator.pass.cpp

@@ -18,6 +18,8 @@
 #include <map>
 #include <functional>
 
+#include "test_macros.h"
+
 
 template <template <typename ...> class Container>
 void test_set() {

test/libcxx/containers/associative/set/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <set>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/associative/tree_balance_after_insert.pass.cpp

@@ -16,6 +16,8 @@
 #include <__tree>
 #include <cassert>
 
+#include "test_macros.h"
+
 struct Node
 {
     Node* __left_;

test/libcxx/containers/associative/tree_left_rotate.pass.cpp

@@ -16,6 +16,8 @@
 #include <__tree>
 #include <cassert>
 
+#include "test_macros.h"
+
 struct Node
 {
     Node* __left_;

test/libcxx/containers/associative/tree_remove.pass.cpp

@@ -16,6 +16,8 @@
 #include <__tree>
 #include <cassert>
 
+#include "test_macros.h"
+
 struct Node
 {
     Node* __left_;

test/libcxx/containers/associative/tree_right_rotate.pass.cpp

@@ -16,6 +16,8 @@
 #include <__tree>
 #include <cassert>
 
+#include "test_macros.h"
+
 struct Node
 {
     Node* __left_;

test/libcxx/containers/associative/undef_min_max.pass.cpp

@@ -15,6 +15,8 @@
 
 #include <map>
 
+#include "test_macros.h"
+
 int main(int, char**) {
   std::map<int, int> m;
   ((void)m);

test/libcxx/containers/container.adaptors/queue/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <queue>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/container.adaptors/stack/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <stack>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/gnu_cxx/hash_map.pass.cpp

@@ -19,6 +19,8 @@ struct equal_to;
 struct unique_ptr;
 #include <ext/hash_map>
 
+#include "test_macros.h"
+
 
 namespace __gnu_cxx {
 template class hash_map<int, int>;

test/libcxx/containers/gnu_cxx/hash_set.pass.cpp

@@ -18,6 +18,8 @@ struct equal_to;
 struct unique_ptr;
 #include <ext/hash_set>
 
+#include "test_macros.h"
+
 namespace __gnu_cxx {
 template class hash_set<int>;
 }

test/libcxx/containers/sequences/array/array.zero/db_back.pass.cpp

@@ -17,6 +17,7 @@
 
 #define _LIBCPP_DEBUG 1
 #include <array>
+#include "test_macros.h"
 #include "debug_mode_helper.h"
 
 int main(int, char**)

test/libcxx/containers/sequences/array/array.zero/db_front.pass.cpp

@@ -17,6 +17,7 @@
 
 #define _LIBCPP_DEBUG 1
 #include <array>
+#include "test_macros.h"
 #include "debug_mode_helper.h"
 
 int main(int, char**)

test/libcxx/containers/sequences/array/array.zero/db_indexing.pass.cpp

@@ -17,6 +17,7 @@
 
 #define _LIBCPP_DEBUG 1
 #include <array>
+#include "test_macros.h"
 #include "debug_mode_helper.h"
 
 int main(int, char**)

test/libcxx/containers/sequences/array/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <array>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/sequences/deque/incomplete.pass.cpp

@@ -16,6 +16,8 @@
 #include <deque>
 #include <cassert>
 
+#include "test_macros.h"
+
 struct A {
   std::deque<A> d;
   std::deque<A>::iterator it;

test/libcxx/containers/sequences/deque/pop_back_empty.pass.cpp

@@ -15,6 +15,8 @@
 #include <cstdlib>
 #include <deque>
 
+#include "test_macros.h"
+
 
 int main(int, char**) {
     std::deque<int> q;

test/libcxx/containers/sequences/deque/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <deque>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/sequences/forwardlist/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <forward_list>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/sequences/list/list.cons/db_copy.pass.cpp

@@ -19,6 +19,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::list<int> l1;

test/libcxx/containers/sequences/list/list.cons/db_move.pass.cpp

@@ -21,6 +21,7 @@
 #include <list>
 #include <cstdlib>
 #include <cassert>
+#include "test_macros.h"
 #include "MoveOnly.h"
 #include "test_allocator.h"
 #include "min_allocator.h"

test/libcxx/containers/sequences/list/list.modifiers/emplace_db1.pass.cpp

@@ -22,6 +22,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include "test_macros.h"
+
 class A
 {
     int i_;

test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp

@@ -20,6 +20,8 @@
 #include <cassert>
 #include <cstdlib>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     int a1[] = {1, 2, 3};

test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp

@@ -20,6 +20,8 @@
 #include <cassert>
 #include <cstdlib>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     int a1[] = {1, 2, 3};

test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp

@@ -20,6 +20,8 @@
 #include <cassert>
 #include <cstdlib>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     int a1[] = {1, 2, 3};

test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp

@@ -20,6 +20,8 @@
 #include <cassert>
 #include <cstdlib>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     int a1[] = {1, 2, 3};

test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp

@@ -20,6 +20,8 @@
 #include <cassert>
 #include <cstdlib>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     int a1[] = {1, 2, 3};

test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp

@@ -20,6 +20,8 @@
 #include <cassert>
 #include <cstdlib>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     int a1[] = {1, 2, 3};

test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp

@@ -21,6 +21,7 @@
 #include <list>
 #include <cstdlib>
 #include <cassert>
+#include "test_macros.h"
 #include "test_iterators.h"
 
 int main(int, char**)

test/libcxx/containers/sequences/list/list.modifiers/insert_iter_rvalue_db1.pass.cpp

@@ -20,6 +20,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::list<int> v1(3);

test/libcxx/containers/sequences/list/list.modifiers/insert_iter_size_value_db1.pass.cpp

@@ -20,6 +20,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::list<int> c1(100);

test/libcxx/containers/sequences/list/list.modifiers/insert_iter_value_db1.pass.cpp

@@ -20,6 +20,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include "test_macros.h"
+
 
 int main(int, char**)
 {

test/libcxx/containers/sequences/list/list.modifiers/pop_back_db1.pass.cpp

@@ -20,6 +20,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     int a[] = {1, 2, 3};

test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list.pass.cpp

@@ -20,6 +20,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     {

test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter.pass.cpp

@@ -20,6 +20,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     {

test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter_iter.pass.cpp

@@ -20,6 +20,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     {

test/libcxx/containers/sequences/list/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <list>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/sequences/vector/const_value_type.pass.cpp

@@ -15,6 +15,8 @@
 #include <vector>
 #include <type_traits>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::vector<const int> v = {1, 2, 3};

test/libcxx/containers/sequences/vector/pop_back_empty.pass.cpp

@@ -15,6 +15,8 @@
 #include <cstdlib>
 #include <vector>
 
+#include "test_macros.h"
+
 
 int main(int, char**) {
     std::vector<int> v;

test/libcxx/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp

@@ -13,6 +13,7 @@
 #include <vector>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 void test_ctor_under_alloc() {

test/libcxx/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp

@@ -14,6 +14,7 @@
 #include <vector>
 #include <cassert>
 
+#include "test_macros.h"
 #include "min_allocator.h"
 
 void test_ctor_under_alloc() {

test/libcxx/containers/sequences/vector/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <vector>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/unord/next_pow2.pass.cpp

@@ -22,6 +22,8 @@
 #include <unordered_map>
 #include <cassert>
 
+#include "test_macros.h"
+
 
 bool
 is_power_of_two(unsigned long n)

test/libcxx/containers/unord/next_prime.pass.cpp

@@ -19,6 +19,8 @@
 #include <__hash_table>
 #include <cassert>
 
+#include "test_macros.h"
+
 bool
 is_prime(size_t n)
 {

test/libcxx/containers/unord/non_const_comparator.pass.cpp

@@ -18,6 +18,8 @@
 #include <unordered_map>
 #include <functional>
 
+#include "test_macros.h"
+
 
 template <template <typename ...> class Container>
 void test_set() {

test/libcxx/containers/unord/unord.map/at.abort.pass.cpp

@@ -22,6 +22,8 @@
 #include <cstdlib>
 #include <unordered_map>
 
+#include "test_macros.h"
+
 
 int main(int, char**) {
     std::signal(SIGABRT, [](int) { std::_Exit(EXIT_SUCCESS); });

test/libcxx/containers/unord/unord.map/at.const.abort.pass.cpp

@@ -22,6 +22,8 @@
 #include <cstdlib>
 #include <unordered_map>
 
+#include "test_macros.h"
+
 
 int main(int, char**) {
     std::signal(SIGABRT, [](int) { std::_Exit(EXIT_SUCCESS); });

test/libcxx/containers/unord/unord.map/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <unordered_map>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/containers/unord/unord.set/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <unordered_set>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/debug/containers/db_associative_container_tests.pass.cpp

@@ -23,6 +23,7 @@
 #include <utility>
 #include <cassert>
 #include "container_debug_tests.hpp"
+#include "test_macros.h"
 #include "debug_mode_helper.h"
 
 using namespace IteratorDebugChecks;

test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp

@@ -26,6 +26,8 @@
 #include <vector>
 #include "container_debug_tests.hpp"
 
+#include "test_macros.h"
+
 
 template <typename Container>
 Container makeContainer(int size) {

test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp

@@ -23,6 +23,7 @@
 #include <vector>
 #include <deque>
 #include "container_debug_tests.hpp"
+#include "test_macros.h"
 #include "debug_mode_helper.h"
 
 using namespace IteratorDebugChecks;

test/libcxx/debug/containers/db_unord_container_tests.pass.cpp

@@ -22,6 +22,7 @@
 #include <utility>
 #include <cassert>
 #include "container_debug_tests.hpp"
+#include "test_macros.h"
 #include "debug_mode_helper.h"
 
 using namespace IteratorDebugChecks;

test/libcxx/debug/debug_abort.pass.cpp

@@ -20,6 +20,8 @@
 #include <cstdlib>
 #include <__debug>
 
+#include "test_macros.h"
+
 void signal_handler(int signal)
 {
     if (signal == SIGABRT)

test/libcxx/debug/debug_helper_test.pass.cpp

@@ -18,6 +18,7 @@
 #define _LIBCPP_DEBUG 1
 
 #include <__debug>
+#include "test_macros.h"
 #include "debug_mode_helper.h"
 
 

test/libcxx/debug/debug_register.pass.cpp

@@ -20,6 +20,8 @@
 #include <__debug>
 #include <cassert>
 
+#include "test_macros.h"
+
 void my_debug_function(std::__libcpp_debug_info const& info) {
   assert(info.__msg_ == std::string("foo"));
   std::exit(0);

test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp

@@ -22,6 +22,8 @@
 #include <memory>
 #include <type_traits>
 
+#include "test_macros.h"
+
 int main(int, char**)
 {
     std::auto_ptr<int> p;

test/libcxx/depr/depr.function.objects/depr.adaptors.cxx1z.pass.cpp

@@ -20,6 +20,8 @@
 #include <functional>
 #include <cassert>
 
+#include "test_macros.h"
+
 int identity(int v) { return v; }
 int sum(int a, int b) { return a + b; }
 

test/libcxx/depr/depr.str.strstreams/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <strstream>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/depr/enable_removed_cpp17_features.pass.cpp

@@ -13,6 +13,8 @@
 #define _LIBCPP_ENABLE_CXX17_REMOVED_FEATURES
 #include <__config>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS
 #error _LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS must be defined
 #endif

test/libcxx/depr/exception.unexpected/get_unexpected.pass.cpp

@@ -15,6 +15,8 @@
 #include <cassert>
 #include <cstdlib>
 
+#include "test_macros.h"
+
 void f1() {}
 void f2() {}
 

test/libcxx/depr/exception.unexpected/set_unexpected.pass.cpp

@@ -14,6 +14,8 @@
 #include <cassert>
 #include <cstdlib>
 
+#include "test_macros.h"
+
 void f1() {}
 void f2() {}
 

test/libcxx/depr/exception.unexpected/unexpected.pass.cpp

@@ -14,6 +14,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include "test_macros.h"
+
 void fexit()
 {
     std::exit(0);

test/libcxx/diagnostics/assertions/version_cassert.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <cassert>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/diagnostics/errno/version_cerrno.pass.cpp

@@ -11,6 +11,8 @@
 
 #include <cerrno>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/diagnostics/nodiscard.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <__config>
 
+#include "test_macros.h"
+
 _LIBCPP_NODISCARD_EXT int foo() { return 42; }
 
 int main(int, char**) {

test/libcxx/diagnostics/nodiscard_aftercxx17.pass.cpp

@@ -14,6 +14,8 @@
 #define _LIBCPP_DISABLE_NODISCARD_AFTER_CXX17
 #include <__config>
 
+#include "test_macros.h"
+
 _LIBCPP_NODISCARD_AFTER_CXX17 int foo() { return 6; }
 
 int main(int, char**)

test/libcxx/diagnostics/std.exceptions/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <stdexcept>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/diagnostics/syserr/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <system_error>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/experimental/algorithms/header.algorithm.synop/includes.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <experimental/algorithm>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_ALGORITHM
 #  error "<experimental/algorithm> must include <algorithm>"
 #endif

test/libcxx/experimental/algorithms/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <experimental/algorithm>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #  error _LIBCPP_VERSION not defined
 #endif

test/libcxx/experimental/diagnostics/syserr/version.pass.cpp

@@ -13,6 +13,8 @@
 #endif
 #include <experimental/system_error>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/experimental/filesystem/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <experimental/filesystem>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_piecewise_pair.pass.cpp

@@ -47,6 +47,8 @@
 #include <cstdlib>
 #include "test_memory_resource.hpp"
 
+#include "test_macros.h"
+
 namespace ex = std::experimental::pmr;
 
 template <class T>

test/libcxx/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/db_deallocate.pass.cpp

@@ -24,6 +24,8 @@ int AssertCount = 0;
 
 #include "test_memory_resource.hpp"
 
+#include "test_macros.h"
+
 namespace ex = std::experimental::pmr;
 
 int main(int, char**)

test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp

@@ -24,6 +24,8 @@ int AssertCount = 0;
 
 #include "test_memory_resource.hpp"
 
+#include "test_macros.h"
+
 namespace ex = std::experimental::pmr;
 
 int main(int, char**)

test/libcxx/experimental/memory/memory.resource.aliases/header_deque_libcpp_version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/deque>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error header must provide _LIBCPP_VERSION
 #endif

test/libcxx/experimental/memory/memory.resource.aliases/header_forward_list_libcpp_version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/forward_list>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error header must provide _LIBCPP_VERSION
 #endif

test/libcxx/experimental/memory/memory.resource.aliases/header_list_libcpp_version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/list>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error header must provide _LIBCPP_VERSION
 #endif

test/libcxx/experimental/memory/memory.resource.aliases/header_map_libcpp_version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/map>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error header must provide _LIBCPP_VERSION
 #endif

test/libcxx/experimental/memory/memory.resource.aliases/header_regex_libcpp_version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/regex>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error header must provide _LIBCPP_VERSION
 #endif

test/libcxx/experimental/memory/memory.resource.aliases/header_set_libcpp_version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/set>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error header must provide _LIBCPP_VERSION
 #endif

test/libcxx/experimental/memory/memory.resource.aliases/header_string_libcpp_version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/string>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error header must provide _LIBCPP_VERSION
 #endif

test/libcxx/experimental/memory/memory.resource.aliases/header_unordered_map_libcpp_version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/unordered_map>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error header must provide _LIBCPP_VERSION
 #endif

test/libcxx/experimental/memory/memory.resource.aliases/header_unordered_set_libcpp_version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/unordered_set>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error header must provide _LIBCPP_VERSION
 #endif

test/libcxx/experimental/memory/memory.resource.aliases/header_vector_libcpp_version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/vector>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error header must provide _LIBCPP_VERSION
 #endif

test/libcxx/experimental/memory/memory.resource.global/global_memory_resource_lifetime.pass.cpp

@@ -21,6 +21,8 @@
 #include <type_traits>
 #include <cassert>
 
+#include "test_macros.h"
+
 namespace ex = std::experimental::pmr;
 
 struct POSType {

test/libcxx/experimental/memory/memory.resource.global/new_delete_resource_lifetime.pass.cpp

@@ -21,6 +21,8 @@
 #include <type_traits>
 #include <cassert>
 
+#include "test_macros.h"
+
 namespace ex = std::experimental::pmr;
 
 struct POSType {

test/libcxx/experimental/memory/memory.resource.synop/version.pass.cpp

@@ -12,6 +12,8 @@
 
 #include <experimental/memory_resource>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/experimental/numerics/numeric.ops/version.pass.cpp

@@ -13,6 +13,8 @@
 #endif
 #include <experimental/numeric>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/experimental/strings/string.view/version.pass.cpp

@@ -13,6 +13,8 @@
 #endif
 #include <experimental/string_view>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/experimental/utilities/any/version.pass.cpp

@@ -13,6 +13,8 @@
 #endif
 #include <experimental/any>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif

test/libcxx/experimental/utilities/meta/version.pass.cpp

@@ -10,6 +10,8 @@
 
 #include <experimental/type_traits>
 
+#include "test_macros.h"
+
 #ifndef _LIBCPP_VERSION
 #error _LIBCPP_VERSION not defined
 #endif