summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/containers/associative/map
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/std/containers/associative/map')
-rw-r--r--libcxx/test/std/containers/associative/map/compare.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/map/gcc_workaround.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/map/incomplete_type.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/map/map.access/empty.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/map/map.access/size.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/alloc.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/compare.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/default.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/default_recursive.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/move.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.cons/move_assign.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/emplace.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/extract_iterator.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/extract_key.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/insert_and_emplace_allocator_requirements.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/insert_node_type.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/insert_node_type_hint.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/insert_or_assign.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/map/map.modifiers/try.emplace.pass.cpp2
-rw-r--r--libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.ops/find0.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.ops/lower_bound0.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.ops/upper_bound0.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.special/member_swap.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp1
-rw-r--r--libcxx/test/std/containers/associative/map/types.pass.cpp1
43 files changed, 50 insertions, 0 deletions
diff --git a/libcxx/test/std/containers/associative/map/compare.pass.cpp b/libcxx/test/std/containers/associative/map/compare.pass.cpp
index 84de271842b..1a582a02d84 100644
--- a/libcxx/test/std/containers/associative/map/compare.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/compare.pass.cpp
@@ -19,6 +19,8 @@
#include <utility>
#include <cassert>
+#include "test_macros.h"
+
struct Key {
template <typename T> Key(const T&) {}
bool operator< (const Key&) const { return false; }
diff --git a/libcxx/test/std/containers/associative/map/gcc_workaround.pass.cpp b/libcxx/test/std/containers/associative/map/gcc_workaround.pass.cpp
index 6c87e51f794..e69a24110b6 100644
--- a/libcxx/test/std/containers/associative/map/gcc_workaround.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/gcc_workaround.pass.cpp
@@ -11,6 +11,8 @@
#include <map>
std::map<int,int>::iterator it;
#include <set>
+
+#include "test_macros.h"
using std::set;
using std::multiset;
diff --git a/libcxx/test/std/containers/associative/map/incomplete_type.pass.cpp b/libcxx/test/std/containers/associative/map/incomplete_type.pass.cpp
index a45c50c3294..c663f8b618c 100644
--- a/libcxx/test/std/containers/associative/map/incomplete_type.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/incomplete_type.pass.cpp
@@ -13,6 +13,8 @@
#include <map>
+#include "test_macros.h"
+
struct A {
typedef std::map<A, A> Map;
int data;
diff --git a/libcxx/test/std/containers/associative/map/map.access/empty.pass.cpp b/libcxx/test/std/containers/associative/map/map.access/empty.pass.cpp
index cff13df7af2..a4cd019ee4d 100644
--- a/libcxx/test/std/containers/associative/map/map.access/empty.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.access/empty.pass.cpp
@@ -15,6 +15,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp b/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp
index bc99f6ef8e3..fccd96855fa 100644
--- a/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp
@@ -21,6 +21,8 @@
#include <tuple>
+#include "test_macros.h"
+
int main(int, char**)
{
diff --git a/libcxx/test/std/containers/associative/map/map.access/size.pass.cpp b/libcxx/test/std/containers/associative/map/map.access/size.pass.cpp
index bb4b14e026f..837f720ec84 100644
--- a/libcxx/test/std/containers/associative/map/map.access/size.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.access/size.pass.cpp
@@ -15,6 +15,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.cons/alloc.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/alloc.pass.cpp
index 5bb9abc88f7..45e867109f8 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/alloc.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/alloc.pass.cpp
@@ -15,6 +15,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
index 612838ef667..c277e9e192d 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
@@ -17,6 +17,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.cons/compare.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/compare.pass.cpp
index 40a8e38aef2..d51ad324953 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/compare.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/compare.pass.cpp
@@ -17,6 +17,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "../../../test_compare.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp
index 71bc32295e0..7437a7f1450 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/compare_alloc.pass.cpp
@@ -15,6 +15,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp
index d25504382e4..93ff5e20acf 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp
@@ -15,6 +15,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp
index a902e05603b..578958aa0c1 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp
@@ -20,6 +20,7 @@
#include <iostream>
+#include "test_macros.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.cons/default.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/default.pass.cpp
index 5d3fcaee117..55a99d20a53 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/default.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/default.pass.cpp
@@ -15,6 +15,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.cons/default_recursive.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/default_recursive.pass.cpp
index af8fbe79f0b..610ca109ef5 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/default_recursive.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/default_recursive.pass.cpp
@@ -14,6 +14,8 @@
#include <map>
+#include "test_macros.h"
+
struct X
{
std::map<int, X> m;
diff --git a/libcxx/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp
index 1303f7ef2ba..559f5d8fa67 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp
@@ -17,6 +17,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
index 9b6a47ac334..fdfec0d00e6 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
@@ -16,6 +16,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "../../../test_compare.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
index 0da3115f76f..f2ba8dfb632 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
@@ -16,6 +16,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp
index 243800cfd9b..fc6a8d2e246 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp
@@ -16,6 +16,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
index 12a079ea01c..25760fa0996 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
@@ -16,6 +16,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "../../../test_compare.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.cons/move.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/move.pass.cpp
index ecf8c9dabfd..e62046f7ef2 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/move.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/move.pass.cpp
@@ -17,6 +17,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.cons/move_assign.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/move_assign.pass.cpp
index 758d0f83f86..56473da0e82 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/move_assign.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/move_assign.pass.cpp
@@ -17,6 +17,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "MoveOnly.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/emplace.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/emplace.pass.cpp
index 382e5c8badf..32def964ba6 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/emplace.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/emplace.pass.cpp
@@ -19,6 +19,7 @@
#include <cassert>
#include <tuple>
+#include "test_macros.h"
#include "../../../Emplaceable.h"
#include "DefaultOnly.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
index 516d88054b7..171a437b74e 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
@@ -18,6 +18,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "../../../Emplaceable.h"
#include "DefaultOnly.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp
index 0f23ef63810..827f3bb5889 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/erase_iter.pass.cpp
@@ -15,6 +15,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
struct TemplateConstructor
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
index 71fa96ce11b..91ca0da60fb 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
@@ -15,6 +15,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp
index da96499b09f..c37cadd6d1d 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/erase_key.pass.cpp
@@ -15,6 +15,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/extract_iterator.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/extract_iterator.pass.cpp
index f2b67c9ff63..2024e7c3f0e 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/extract_iterator.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/extract_iterator.pass.cpp
@@ -15,6 +15,7 @@
// node_type extract(const_iterator);
#include <map>
+#include "test_macros.h"
#include "min_allocator.h"
#include "Counter.h"
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/extract_key.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/extract_key.pass.cpp
index 018e9acf898..0e47d047f33 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/extract_key.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/extract_key.pass.cpp
@@ -15,6 +15,7 @@
// node_type extract(key_type const&);
#include <map>
+#include "test_macros.h"
#include "min_allocator.h"
#include "Counter.h"
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_and_emplace_allocator_requirements.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_and_emplace_allocator_requirements.pass.cpp
index f3e84002123..ea6bd2381c9 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_and_emplace_allocator_requirements.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_and_emplace_allocator_requirements.pass.cpp
@@ -18,6 +18,7 @@
#include <map>
+#include "test_macros.h"
#include "container_test_types.h"
#include "../../../map_allocator_requirement_test_templates.h"
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
index ea6c1380054..b4bbdd507ae 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
@@ -17,6 +17,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
index a6a7763363b..d59c4810cca 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
@@ -16,6 +16,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "test_iterators.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_node_type.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_node_type.pass.cpp
index f3f1662600e..3576ccffb0f 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_node_type.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_node_type.pass.cpp
@@ -16,6 +16,7 @@
#include <map>
#include <type_traits>
+#include "test_macros.h"
#include "min_allocator.h"
template <class Container>
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_node_type_hint.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_node_type_hint.pass.cpp
index 084f7ee2c74..9777989f0af 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_node_type_hint.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_node_type_hint.pass.cpp
@@ -15,6 +15,7 @@
// iterator insert(const_iterator hint, node_type&&);
#include <map>
+#include "test_macros.h"
#include "min_allocator.h"
template <class Container>
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_or_assign.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_or_assign.pass.cpp
index bd9625a0950..673db86b7f3 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_or_assign.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_or_assign.pass.cpp
@@ -27,6 +27,8 @@
#include <iostream>
+#include "test_macros.h"
+
class Moveable
{
Moveable(const Moveable&);
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/try.emplace.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/try.emplace.pass.cpp
index fe9484a3ce3..ea7b18b5624 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/try.emplace.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/try.emplace.pass.cpp
@@ -25,6 +25,8 @@
#include <cassert>
#include <tuple>
+#include "test_macros.h"
+
class Moveable
{
Moveable(const Moveable&);
diff --git a/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp
index cce0444fdc3..163327114f6 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp
@@ -23,6 +23,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "is_transparent.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp
index 22f067a2a70..92dcd2d8563 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp
@@ -23,6 +23,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "is_transparent.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.ops/find0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/find0.pass.cpp
index affc61efb54..1c843adcb34 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/find0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/find0.pass.cpp
@@ -23,6 +23,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "is_transparent.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound0.pass.cpp
index a92790f2bd6..cb74648789c 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound0.pass.cpp
@@ -23,6 +23,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "is_transparent.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound0.pass.cpp
index 8f58df61b7d..6780f6f44ed 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound0.pass.cpp
@@ -23,6 +23,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "is_transparent.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.special/member_swap.pass.cpp b/libcxx/test/std/containers/associative/map/map.special/member_swap.pass.cpp
index a41e43f7a06..ddce2225e0c 100644
--- a/libcxx/test/std/containers/associative/map/map.special/member_swap.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.special/member_swap.pass.cpp
@@ -15,6 +15,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
diff --git a/libcxx/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp b/libcxx/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
index 811acc4573e..9a8c86316b6 100644
--- a/libcxx/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
@@ -16,6 +16,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "test_allocator.h"
#include "../../../test_compare.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/containers/associative/map/types.pass.cpp b/libcxx/test/std/containers/associative/map/types.pass.cpp
index 35fc067433f..0cfb7c00e81 100644
--- a/libcxx/test/std/containers/associative/map/types.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/types.pass.cpp
@@ -31,6 +31,7 @@
#include <map>
#include <type_traits>
+#include "test_macros.h"
#include "min_allocator.h"
int main(int, char**)
OpenPOWER on IntegriCloud